From e0e24363aa009ed49490bf90fc7871159caa9b2b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 3 Jul 2008 12:45:53 +0000 Subject: [PATCH] Fix build on Windows --- libraries/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index e3cb634..faa946d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -161,8 +161,7 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages -CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(BOOTSTRAPPING_CONF) -BOOTSTRAPPING_CONF=$(HERE_ABS)/bootstrapping.conf +CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" @@ -173,12 +172,12 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/b .PHONY: boot -boot: ifBuildable/ifBuildable cabal-bin $(BOOTSTRAPPING_CONF) +boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf cabal-bin: cabal-bin.hs $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin -$(BOOTSTRAPPING_CONF): cabal-bin +bootstrapping.conf: cabal-bin echo "[]" > $@.tmp -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$@.tmp -- 1.7.10.4