X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.mk;h=f2a4fc5310ea3f124bba07487b12d7bf9fc507ba;hp=4a042cb5f7c03b03ad5a1a980647d35e3aa851e0;hb=59300a7161f44b3a2afe381a6ccd914043a32c4f;hpb=872bd77dda95ff67340588ee5b5653a9f289d369 diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 4a042cb..f2a4fc5 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -51,6 +51,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk @echo "cBooterVersion = \"$(GhcVersion)\"" >> $@ @echo "cStage :: String" >> $@ @echo "cStage = show (STAGE :: Int)" >> $@ + @echo "cIntegerLibrary :: String" >> $@ + @echo "cIntegerLibrary = \"$(INTEGER_LIBRARY)\"" >> $@ @echo "cSplitObjs :: String" >> $@ @echo "cSplitObjs = \"$(SupportsSplitObjs)\"" >> $@ @echo "cGhcWithInterpreter :: String" >> $@ @@ -75,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" >> $@ @@ -139,8 +141,7 @@ $(eval $(call clean-target,compiler,config_hs,$(compiler_CONFIG_HS))) PLATFORM_H = ghc_boot_platform.h -compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk - "$(MKDIRHIER)" $(dir $@) +compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -186,8 +187,7 @@ endif # For stage2 and above, the BUILD platform is the HOST of stage1, and # the HOST platform is the TARGET of stage1. The TARGET remains the same # (stage1 is the cross-compiler, not stage2). -compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk - "$(MKDIRHIER)" $(dir $@) +compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -257,6 +257,7 @@ $(PRIMOPS_TXT) compiler/parser/Parser.y: %: %.pp compiler/stage1/$(PLATFORM_H) $(eval $(call clean-target,compiler,primop, $(PRIMOPS_TXT) compiler/parser/Parser.y $(PRIMOP_BITS))) +ifneq "$(BootingFromHc)" "YES" compiler/primop-data-decl.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) "$(GENPRIMOP_INPLACE)" --data-decl < $< > $@ compiler/primop-tag.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) @@ -282,6 +283,7 @@ compiler/primop-primop-info.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) # can still generate them if we want them back compiler/primop-usage.hs-incl: $(PRIMOPS_TXT) "$(GENPRIMOP_INPLACE)" --usage < $< > $@ +endif # ----------------------------------------------------------------------------- # Configuration @@ -362,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='""' \ --ghc-option='-\#include' \ --ghc-option='""' 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) @@ -408,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 @@ -451,17 +462,23 @@ $(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(inclu $(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) # Every Constants.o object file depends on includes/GHCConstants.h: -$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS))) +$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS) includes/HaskellConstants.hs)) # Every PrimOp.o object file depends on $(PRIMOP_BITS): $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS))) +# GHC itself doesn't know about the above dependencies, so we have to +# switch off the recompilation checker for those modules: +compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp +compiler/main/Constants_HC_OPTS += -fforce-recomp + # Note [munge-stage1-package-config] # Strip the date/patchlevel from the version of stage1. See Note # [fiddle-stage1-version] above. 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) $@