X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.mk;h=86f91a9d6abe8408165bc4ec19cd985348183d2a;hp=5b59bbefb743d81c6a9b6a73eab2b02e9de54b52;hb=fb6d198f498d4e325a540f28aaa6e1d1530839c3;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 5b59bbe..86f91a9 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -17,7 +17,7 @@ define compiler-hs-dependency # args: $1 = module, $2 = dependency $$(foreach stage,1 2 3,\ $$(foreach way,$$(compiler_stage$$(stage)_WAYS),\ - compiler/stage$$(stage)/build/$1.$($(way)_osuf))) : $2 + compiler/stage$$(stage)/build/$1.$$($$(way)_osuf))) : $2 endef @@ -35,7 +35,7 @@ compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) compiler/stage3/package-data.mk : $(compiler_CONFIG_HS) endif -$(compiler_CONFIG_HS) : mk/config.mk +$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk "$(RM)" $(RM_OPTS) $@ @echo "Creating $@ ... " @echo "module Config where" >>$@ @@ -51,8 +51,8 @@ $(compiler_CONFIG_HS) : mk/config.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 @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" >> $@ @@ -141,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 - "$(MKDIRHIER)" $(dir $@) +compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -188,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 - "$(MKDIRHIER)" $(dir $@) +compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/. "$(RM)" $(RM_OPTS) $@ @echo "Creating $@..." @echo "#ifndef __PLATFORM_H__" >$@ @@ -235,9 +233,6 @@ endif compiler/stage3/$(PLATFORM_H) : compiler/stage2/$(PLATFORM_H) "$(CP)" $< $@ -# Every Constants.o object file depends on includes/GHCConstants.h: -$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS))) - # ---------------------------------------------------------------------------- # Generate supporting stuff for prelude/PrimOp.lhs # from prelude/primops.txt @@ -283,9 +278,6 @@ compiler/primop-strictness.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) compiler/primop-primop-info.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) "$(GENPRIMOP_INPLACE)" --primop-primop-info < $< > $@ -# Every PrimOp.o object file depends on $(PRIMOP_BITS): -$(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS))) - # Usages aren't used any more; but the generator # can still generate them if we want them back compiler/primop-usage.hs-incl: $(PRIMOPS_TXT) @@ -370,19 +362,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) @@ -416,9 +412,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 @@ -458,12 +459,24 @@ $(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(inclu $(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) $(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) 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) $@