X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=894f2dfb3b48927a4a53d255e620edf03e7811d7;hb=fb54e7be395ac278f979dc542e93e7830632c07b;hp=fba3e9f00ef9fe050a4c03e4d45ecd5de3cd612b;hpb=23d0490b666739ae487644dabee1474a38db60f9;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index fba3e9f..894f2df 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -13,10 +13,18 @@ else
 INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
+# Don't strip the inplace versions, we might need to debug them
+INPLACE_INSTALL_FLAGS += --disable-executable-stripping
+
 boot:: boot.stage.$(stage)
 
 all:: build.stage.$(stage)
 
+rebuild ::
+	-$(CABAL) clean --distpref dist-stage$(stage)
+	$(RM) -rf stage$(stage)-inplace
+	$(MAKE) boot all
+
 stage1 ::
 	$(MAKE) stage=1
 
@@ -56,16 +64,30 @@ ifeq "$(GhcThreaded)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
 endif
 
+ifeq "$(BuildSharedLibs)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-dynamic
+endif
+
 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)
 
+# Allow EXTRA_HC_OPTS to be used from the command line to add options 
+# when building (e.g. -v)
+BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
+
 # XXX In stage2+ we should really use the inplace ghc-pkg
 # It works because installPackage doesn't actually use ghc-pkg, as there's
 # no library to register
 
+ifeq "$(stage)" "1"
+# GHC 6.9+ can handle cross-package recompilation checking, but
+# we don't rely on the bootstrapping compiler being able to do this.
+TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
+endif
+
 boot.stage.%:
 	$(CABAL) configure --distpref dist-stage$*         \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -76,11 +98,12 @@ boot.stage.%:
 	                   --datasubdir=.
 
 build.stage.%:
+	$(TOUCH_MAIN)
 	$(CABAL) build     --distpref dist-stage$* $(BUILD_FLAGS)
 	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
 	                   $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace          \
 	                   $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace          \
-	                   '$$prefix/bin'                                  \
+	                   '$$prefix'                                      \
 	                   '$(INPLACE_DATA_DIR)'                           \
 	                   '$$prefix/libexec'                              \
 	                   '$$prefix/dynlib'                               \
@@ -89,6 +112,7 @@ build.stage.%:
 	                   '$$prefix/html'                                 \
 	                   '$$prefix/haddock'                              \
 	                   --distpref dist-stage$*                         \
+	                   $(INPLACE_INSTALL_FLAGS)                        \
 	                   $(INSTALL_FLAGS)
 
 # XXX For now we always install the stage 2 compiler