Follow extensible exception changes

[ghc-hetmet.git] / ghc / Makefile

diff --git a/ghc/Makefile b/ghc/Makefile
index 806db1a..282ffe7 100644 (file)
--- 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
@@ -85,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'                               \
@@ -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