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

diff --git a/ghc/Makefile b/ghc/Makefile
index 88b4dc0..282ffe7 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -13,6 +13,9 @@ 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)
@@ -61,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
@@ -94,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