X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=70c95f3426d60996ab938c9061fdc378bafa1bf2;hb=354503a27a016b2cc030b7fae5d007b0259c77d2;hp=400b6b3d48265f1b40b36495f675238ebb72335e;hpb=2675f2b68794ef6712e1ea0b9ec110c46c9e5ebf;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 400b6b3..70c95f3 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -51,8 +51,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cBooterVersion        = \"$(GhcVersion)\"" >> $@
 	@echo "cStage                :: String" >> $@
 	@echo "cStage                = show (STAGE :: Int)" >> $@
-	@echo "cHscIfaceFileVersion  :: String" >> $@
-	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $@
+	@echo "cIntegerLibrary       :: String" >> $@
+	@echo "cIntegerLibrary       = \"$(INTEGER_LIBRARY)\"" >> $@
 	@echo "cSplitObjs            :: String" >> $@
 	@echo "cSplitObjs            = \"$(SupportsSplitObjs)\"" >> $@
 	@echo "cGhcWithInterpreter   :: String" >> $@
@@ -77,30 +77,30 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cMKDLL                = \"$(BLD_DLL)\"" >> $@
 	@echo "cLdIsGNULd            :: String" >> $@
 	@echo "cLdIsGNULd            = \"$(LdIsGNULd)\"" >> $@
-	@echo "cLD_X		     :: String" >> $@
-	@echo "cLD_X		     = \"$(LD_X)\"" >> $@
-	@echo "cGHC_DRIVER_DIR   :: String" >> $@
-	@echo "cGHC_DRIVER_DIR   = \"$(GHC_DRIVER_DIR)\"" >> $@
+	@echo "cLD_X                 :: String" >> $@
+	@echo "cLD_X                 = \"$(LD_X)\"" >> $@
+	@echo "cGHC_DRIVER_DIR       :: String" >> $@
+	@echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> $@
 	@echo "cGHC_TOUCHY_PGM       :: String" >> $@
 	@echo "cGHC_TOUCHY_PGM       = \"$(GHC_TOUCHY_PGM)\"" >> $@
-	@echo "cGHC_TOUCHY_DIR   :: String" >> $@
-	@echo "cGHC_TOUCHY_DIR   = \"$(GHC_TOUCHY_DIR)\"" >> $@
+	@echo "cGHC_TOUCHY_DIR       :: String" >> $@
+	@echo "cGHC_TOUCHY_DIR       = \"$(GHC_TOUCHY_DIR)\"" >> $@
 	@echo "cGHC_UNLIT_PGM        :: String" >> $@
 	@echo "cGHC_UNLIT_PGM        = \"$(GHC_UNLIT_PGM)\"" >> $@
-	@echo "cGHC_UNLIT_DIR    :: String" >> $@
-	@echo "cGHC_UNLIT_DIR    = \"$(GHC_UNLIT_DIR)\"" >> $@
+	@echo "cGHC_UNLIT_DIR        :: String" >> $@
+	@echo "cGHC_UNLIT_DIR        = \"$(GHC_UNLIT_DIR)\"" >> $@
 	@echo "cGHC_MANGLER_PGM      :: String" >> $@
 	@echo "cGHC_MANGLER_PGM      = \"$(GHC_MANGLER_PGM)\"" >> $@
-	@echo "cGHC_MANGLER_DIR  :: String" >> $@
-	@echo "cGHC_MANGLER_DIR  = \"$(GHC_MANGLER_DIR)\"" >> $@
+	@echo "cGHC_MANGLER_DIR      :: String" >> $@
+	@echo "cGHC_MANGLER_DIR      = \"$(GHC_MANGLER_DIR)\"" >> $@
 	@echo "cGHC_SPLIT_PGM        :: String" >> $@
 	@echo "cGHC_SPLIT_PGM        = \"$(GHC_SPLIT_PGM)\"" >> $@
-	@echo "cGHC_SPLIT_DIR    :: String" >> $@
-	@echo "cGHC_SPLIT_DIR    = \"$(GHC_SPLIT_DIR)\"" >> $@
+	@echo "cGHC_SPLIT_DIR        :: String" >> $@
+	@echo "cGHC_SPLIT_DIR        = \"$(GHC_SPLIT_DIR)\"" >> $@
 	@echo "cGHC_SYSMAN_PGM       :: String" >> $@
 	@echo "cGHC_SYSMAN_PGM       = \"$(GHC_SYSMAN)\"" >> $@
-	@echo "cGHC_SYSMAN_DIR   :: String" >> $@
-	@echo "cGHC_SYSMAN_DIR   = \"$(GHC_SYSMAN_DIR)\"" >> $@
+	@echo "cGHC_SYSMAN_DIR       :: String" >> $@
+	@echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $@
 	@echo "cGHC_CP               :: String" >> $@
 	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $@
 	@echo "cGHC_PERL             :: String" >> $@
@@ -364,19 +364,23 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 # The #include is vital for the via-C route with older compilers, else the C
 # compiler doesn't realise that the stcall foreign imports are indeed
 # stdcall, and doesn't generate the Foo@8 name for them
-# As it's only important for older compilers we don't need to do anything
-# for stage2+.
+# It's only important for older compilers, and in fact newer compilers
+# will give a warning if the -#include flag is used. We therefore only
+# do it for stage1, and only for < 6.11.
+ifeq "$(ghc_ge_611)" "NO"
 compiler_stage1_CONFIGURE_OPTS += --ghc-option='-\#include'    \
                           --ghc-option='"<windows.h>"' \
                           --ghc-option='-\#include'    \
                           --ghc-option='"<process.h>"'
 endif
+endif
 
 # ghc_strlen percolates through so many modules that it is easier to get its
 # prototype via a global option instead of a myriad of per-file OPTIONS.
-# Again, this is only important for older compilers, so we don't do it in
-# stage 2+.
+# Again, this is only done for older compilers.
+ifeq "$(ghc_ge_611)" "NO"
 compiler_stage1_CONFIGURE_OPTS += --ghc-options='-\#include "cutils.h"'
+endif
 
 compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS)
 
@@ -410,9 +414,14 @@ compiler_PACKAGE = ghc
 # when it gets registered; see Note [munge-stage1-package-config]
 # below.
 ifneq "$(ProjectPatchLevel)" "0"
+
 define compiler_PACKAGE_MAGIC
 compiler_stage1_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion))
 endef
+
+# Don't register the non-munged package
+compiler_stage1_REGISTER_PACKAGE = NO
+
 endif
 
 # haddocking only happens for stage2
@@ -464,6 +473,7 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 ifneq "$(ProjectPatchLevel)" "0"
 compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
 	sed -e 's/^\(version: .*\)\.$(ProjectPatchLevel)$$/\1/' \
+	    -e 's/^\(id: .*\)\.$(ProjectPatchLevel)$$/\1/' \
 	    -e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)$$/\1/' \
 	  < $< > $@
 	"$(compiler_stage1_GHC_PKG)" update --force $(compiler_stage1_GHC_PKG_OPTS) $@