X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=129adfc4d54bd5d70a93c5746a312fd37671ff2e;hb=4a6f2bc7c3da7e74192339502704877bfc12ccc1;hp=371ebb4932cb5083c5ecf71a8c6a183f2fbe89f1;hpb=f7478aee130646e7ddc0e857d3462a60b6a46947;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 371ebb4..129adfc 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -40,10 +40,6 @@ PRIMOP_BITS = primop-data-decl.hs-incl \ primop-strictness.hs-incl \ primop-primop-info.hs-incl -boot :: $(CONFIG_HS) - -boot :: parser/Parser.y - boot:: boot.stage.$(stage) all:: build.stage.$(stage) @@ -166,7 +162,7 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS) -boot.stage.%: +boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y $(CABAL) configure --distpref dist-stage$* \ $(CONFIGURE_FLAGS_STAGE$*) \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ @@ -175,10 +171,14 @@ boot.stage.%: $(RM) -f Makefile-stage$* $(CABAL) makefile --distpref dist-stage$* -f Makefile-stage$* -build.stage.%: $(PRIMOP_BITS) +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)