X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=129adfc4d54bd5d70a93c5746a312fd37671ff2e;hb=bb7ffa1642e2110e26e1243c42a8a24adafa985d;hp=dbc472596b5b4d371d8eea6b0e304838039e2a49;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index dbc4725..129adfc 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -40,7 +40,9 @@ PRIMOP_BITS = primop-data-decl.hs-incl        \
               primop-strictness.hs-incl       \
               primop-primop-info.hs-incl
 
-all:: build.stage$(stage)
+boot:: boot.stage.$(stage)
+
+all:: build.stage.$(stage)
 
 stage1 ::
 	$(MAKE) stage=1
@@ -59,6 +61,12 @@ clean distclean::
 	$(RM) -f prelude/primops.txt
 	$(RM) -f $(PRIMOP_BITS)
 	$(RM) -f $(CONFIG_HS)
+	$(RM) -f parser/Parser.y
+
+CONFIGURE_FLAGS_STAGE1 += --flags=stage1
+CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
+
+CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
 ifeq "$(GhcWithInterpreter)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --flags=ghci
@@ -117,20 +125,17 @@ endif
 ifeq "$(GhcWithNativeCodeGen)" "NO"
 # XXX This should logically be a CPP option, but there doesn't seem to
 # be a flag for that
-CONFIGURE_FLAGS_STAGE1 += --ghc-option=-DOMIT_NATIVE_CODEGEN
-CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DOMIT_NATIVE_CODEGEN
+COMMON_CONFIGURE_FLAGS += --ghc-option=-DOMIT_NATIVE_CODEGEN
 endif
 
 ifeq "$(TargetOS_CPP)" "openbsd"
-CONFIGURE_FLAGS_STAGE1 += --ld-options="-Xlinker -E"
-CONFIGURE_FLAGS_STAGE2 += --ld-options="-Xlinker -E"
+COMMON_CONFIGURE_FLAGS += --ld-options="-Xlinker -E"
 endif
 
 ifeq "$(GhcUnregisterised)" "NO"
 ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
 # needed for generating proper relocation in large binaries: trac #856
-CONFIGURE_FLAGS_STAGE1 += --ld-option=-Wl,--relax
-CONFIGURE_FLAGS_STAGE2 += --ld-option=-Wl,--relax
+COMMON_CONFIGURE_FLAGS += --ld-option=-Wl,--relax
 endif
 endif
 
@@ -140,7 +145,10 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 # stdcall, and doesn't generate the Foo@8 name for them
 # As it's only important for older compilers we don't need to do anything
 # for stage2+.
-CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include <windows.h> -\#include <process.h>'
+CONFIGURE_FLAGS_STAGE1 += --ghc-option='-\#include'    \
+                          --ghc-option='"<windows.h>"' \
+                          --ghc-option='-\#include'    \
+                          --ghc-option='"<process.h>"'
 endif
 
 # ghc_strlen percolates through so many modules that it is easier to get its
@@ -149,32 +157,27 @@ endif
 # stage 2+.
 CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include "cutils.h"'
 
-build.stage1: $(PRIMOP_BITS)
-	$(CABAL) configure --distpref dist-stage1 \
-	                   $(CONFIGURE_FLAGS_STAGE1) \
-	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_BOOT_CONFIGURE_FLAGS) \
-	                   $(COMMON_CONFIGURE_FLAGS) \
-	                   --flags=-ghci \
-	                   --flags=stage1 \
-	                   --ghc-option=-DSTAGE=1
-	$(RM) -f Makefile-stage1
-	$(CABAL) makefile  --distpref dist-stage1 -f Makefile-stage1
-	$(MAKE) -f Makefile-stage1 stage=1
-	$(CABAL) register  --distpref dist-stage1 --inplace
+CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
+CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
-build.stage2: $(PRIMOP_BITS)
-	$(CABAL) configure --distpref dist-stage2 \
-	                   $(CONFIGURE_FLAGS_STAGE2) \
+boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
+	$(CABAL) configure --distpref dist-stage$* \
+	                   $(CONFIGURE_FLAGS_STAGE$*) \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_STAGE1_CONFIGURE_FLAGS) \
 	                   $(COMMON_CONFIGURE_FLAGS) \
-	                   --flags=-stage1 \
-	                   --ghc-option=-DSTAGE=2
-	$(RM) -f Makefile-stage2
-	$(CABAL) makefile  --distpref dist-stage2 -f Makefile-stage2
-	$(MAKE) -f Makefile-stage2 stage=2
-	$(CABAL) register  --distpref dist-stage2 --inplace
+	                   --ghc-option=-DSTAGE=$*
+	$(RM) -f Makefile-stage$*
+	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
+
+build.stage.%:
+	$(MAKE) -f Makefile-stage$* stage=$*
+	$(CABAL) register  --distpref dist-stage$* --inplace
+
+# XXX We ought to actually install the (stage 2) library
+install:
+	@:
 
 stage_dirs :
 	$(MKDIRHIER) stage$(stage)
@@ -187,8 +190,6 @@ boot :: stage_dirs
 # The 'echo' commands simply spit the values of various make variables
 # into Config.hs, whence they can be compiled and used by GHC itself
 
-boot :: $(CONFIG_HS)
-
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@$(RM) -f $(CONFIG_HS)
 	@echo "Creating $(CONFIG_HS) ... "