Tweak the ghc-pkg finding code

[ghc-hetmet.git] / ghc / ghc.mk

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 4c98b3e..a1edb17 100644 (file)
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -35,6 +35,11 @@ ifeq "$(GhcDebugged)" "YES"
 ghc_HC_OPTS += -debug
 endif
 
+ifeq "$(GhcDynamic)" "YES"
+ghc_stage2_HC_OPTS += -dynamic
+ghc_stage3_HC_OPTS += -dynamic
+endif
+
 ifeq "$(GhcThreaded)" "YES"
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
 ghc_stage2_HC_OPTS += -threaded
@@ -103,9 +108,16 @@ define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
 echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
 endef
 
+# If we "make 1" or "make 2" then we don't want the rules for the stage
+# that we haven't been asked to build
 ifeq "$(stage)" "1"
 ghc_stage2_NOT_NEEDED = YES
 endif
+ifeq "$(stage)" "2"
+ghc_stage1_NOT_NEEDED = YES
+endif
+# We don't want the rules for stage3 unless we have been explicitly
+# asked to build it
 ifneq "$(stage)" "3"
 ghc_stage3_NOT_NEEDED = YES
 endif