Don't do SpecConstr on NOINLINE things (Trac #4064)

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

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 3437a76..1c61494 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -111,10 +111,6 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
        @echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $@
        @echo "cGHC_PERL             :: String" >> $@
        @echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $@
-       @echo "cUSER_WAY_NAMES       :: String" >> $@
-       @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $@
-       @echo "cUSER_WAY_OPTS        :: String" >> $@
-       @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $@
        @echo "cDEFAULT_TMPDIR       :: String" >> $@
        @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $@
        @echo "cRelocatableBuild     :: Bool"                 >> $@
@@ -443,24 +439,23 @@ compiler_stage1_SplitObjs = NO
 compiler_stage2_SplitObjs = NO
 compiler_stage3_SplitObjs = NO
 
-# For now, bindists always use stage 2
-ifneq "$(BINDIST)" "YES"
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-package,compiler,stage1,0))
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
+compiler_stage1_NOT_NEEDED = YES
 endif
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+compiler_stage2_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-package,compiler,stage2,1))
+# stage 3 has to be requested explicitly with stage=3
+ifneq "$(stage)" "3"
+compiler_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-package,compiler,stage1,0))
+$(eval $(call build-package,compiler,stage2,1))
+$(eval $(call build-package,compiler,stage3,2))
 
 ifneq "$(BINDIST)" "YES"
-# stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-package,compiler,stage3,2))
-endif
 
 compiler_stage2_TAGS_HC_OPTS = -package ghc
 $(eval $(call tags-package,compiler,stage2))
@@ -484,6 +479,13 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
 compiler/main/Constants_HC_OPTS  += -fforce-recomp
 
+# Workaround for #4003 in GHC 6.12.2.  It didn't happen in 6.12.1, and
+# will be fixed in 6.12.3.  Unfortunately we don't have a way to do
+# this for just stage1 in the build system.
+ifeq "$(GhcVersion)" "6.12.2"
+compiler/hsSyn/HsLit_HC_OPTS     += -fomit-interface-pragmas
+endif
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.