X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=282ffe7066bcc9f06c1abf8d983cdf45709311f9;hb=fbb4683ec21a94a9614191db5d1bf458b489b6c7;hp=4ee970cd656ff23d0992a029191e9bac9d1064be;hpb=f893fb935d23418b80534b05f35fe50d54af0acc;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4ee970c..282ffe7 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
 
@@ -29,8 +37,10 @@ stage3 ::
 clean distclean::
 	-$(CABAL) clean --distpref dist-stage1
 	-$(CABAL) clean --distpref dist-stage2
+	-$(CABAL) clean --distpref dist-stage3
 	$(RM) -rf stage1-inplace
 	$(RM) -rf stage2-inplace
+	$(RM) -rf stage3-inplace
 
 # XXX This should be defined somewhere more central
 INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
@@ -54,12 +64,20 @@ 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
@@ -78,7 +96,7 @@ build.stage.%:
 	$(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'                               \
@@ -87,6 +105,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