X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.mk;h=3b68d5b3b971df7aceab031c39e9e523b385745e;hb=d108044bef62f6a0d579c92ced5e8188f72edc2d;hp=1f0b287ca55a03a84ca0502529a54b53d50671d1;hpb=aea784af873f089a40af71849d83f59008562a58;p=ghc-hetmet.git

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 1f0b287..3b68d5b 100644
--- 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,20 +108,21 @@ define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
 echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
 endef
 
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-prog,ghc,stage1,0))
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
+ghc_stage1_NOT_NEEDED = YES
 endif
-
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-prog,ghc,stage2,1))
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+ghc_stage2_NOT_NEEDED = YES
 endif
-
 # stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-prog,ghc,stage3,2))
+ifneq "$(stage)" "3"
+ghc_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-prog,ghc,stage1,0))
+$(eval $(call build-prog,ghc,stage2,1))
+$(eval $(call build-prog,ghc,stage3,2))
 
 ifneq "$(BINDIST)" "YES"
 
@@ -125,6 +131,11 @@ ghc/stage1/build/tmp/$(ghc_stage1_PROG) : $(compiler_stage1_v_LIB)
 ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_v_LIB)
 ghc/stage3/build/tmp/$(ghc_stage3_PROG) : $(compiler_stage3_v_LIB)
 
+ifeq "$(GhcProfiled)" "YES"
+ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_p_LIB)
+ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_p_LIB))
+endif
+
 # Modules here import HsVersions.h, so we need ghc_boot_platform.h
 $(ghc_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H)
 $(ghc_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H)