X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.mk;h=b33117a61b2bf2aaa1abb45241a4bcb37b3b5bbf;hp=59b451dd3f00996e784ec206b086eb1e351ecb15;hb=836b1e90821aacc9d1e09fe78085f911597274c8;hpb=a7d8d283592f4698325b0c5e06244a3edc6fd35c diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 59b451d..b33117a 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -29,6 +29,14 @@ endef compiler_CONFIG_HS = compiler/main/Config.hs +# This is just to avoid generating a warning when generating deps +# involving RtsFlags.h +compiler_stage1_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES + +compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c + ifneq "$(BINDIST)" "YES" compiler/stage1/package-data.mk : $(compiler_CONFIG_HS) compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) @@ -51,6 +59,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" >> $@ @@ -139,8 +149,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 +195,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 +265,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 +291,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,26 +372,30 @@ 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) compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DSTAGE=1 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3 -compiler_stage2_HADDOCK_OPTS += --haddock-option=--optghc=-DSTAGE=2 +compiler_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2 compiler_stage1_CONFIGURE_OPTS += --ghc-options='$(GhcStage1HcOpts)' compiler_stage2_CONFIGURE_OPTS += --ghc-options='$(GhcStage2HcOpts)' @@ -407,10 +421,22 @@ compiler_PACKAGE = ghc # Note: we also have to tweak the version number of the package itself # when it gets registered; see Note [munge-stage1-package-config] # below. -ifneq "$(ProjectPatchLevel)" "0" +# The ProjectPatchLevel > 20000000 iff it's a date. If it's e.g. 6.12.1 +# then we don't want to remove it +ifneq "$(CLEANING)" "YES" +ifeq "$(shell [ $(ProjectPatchLevel) -gt 20000000 ] && echo YES)" "YES" +compiler_stage1_VERSION_MUNGED = YES +endif +endif + +ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" 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 @@ -442,26 +468,32 @@ ifeq "$(stage)" "3" $(eval $(call build-package,compiler,stage3,2)) endif -$(compiler_stage1_depfile) : compiler/stage1/$(PLATFORM_H) -$(compiler_stage2_depfile) : compiler/stage2/$(PLATFORM_H) -$(compiler_stage3_depfile) : compiler/stage3/$(PLATFORM_H) +$(compiler_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H) +$(compiler_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H) +$(compiler_stage3_depfile_haskell) : compiler/stage3/$(PLATFORM_H) -$(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) -$(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) +$(compiler_stage1_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage2_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage3_depfile_haskell) : $(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" +ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" 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) $@