diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2021-03-31 14:15:48 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-10 05:31:14 -0400 |
commit | 2cdc95f9c068421a55c634933ab2d8596eb992fb (patch) | |
tree | 65fd82a66c8054143d3a49037bc3d841a405d98d | |
parent | 085983e63bfe6af23f8b85fbfcca8db4872d2f60 (diff) | |
download | haskell-2cdc95f9c068421a55c634933ab2d8596eb992fb.tar.gz |
Don't produce platformConstants file
It isn't used for anything anymore
-rw-r--r-- | ghc/ghc.mk | 4 | ||||
-rw-r--r-- | hadrian/doc/make.md | 11 | ||||
-rw-r--r-- | hadrian/src/Base.hs | 1 | ||||
-rw-r--r-- | hadrian/src/Settings/Builders/DeriveConstants.hs | 1 | ||||
-rw-r--r-- | includes/ghc.mk | 8 |
5 files changed, 0 insertions, 25 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 0e479a24bc..df03c41dbb 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -146,9 +146,6 @@ $(INPLACE_LIB)/llvm-targets : llvm-targets $(INPLACE_LIB)/llvm-passes : llvm-passes "$(CP)" $< $@ -$(INPLACE_LIB)/platformConstants: $(includes_GHCCONSTANTS_HASKELL_VALUE) - "$(CP)" $< $@ - # The GHC programs need to depend on all the helper programs they might call, # and the settings files they use @@ -156,7 +153,6 @@ GHC_DEPENDENCIES += $$(unlit_INPLACE) GHC_DEPENDENCIES += $(INPLACE_LIB)/settings GHC_DEPENDENCIES += $(INPLACE_LIB)/llvm-targets GHC_DEPENDENCIES += $(INPLACE_LIB)/llvm-passes -GHC_DEPENDENCIES += $(INPLACE_LIB)/platformConstants $(GHC_STAGE1) : | $(GHC_DEPENDENCIES) $(GHC_STAGE2) : | $(GHC_DEPENDENCIES) diff --git a/hadrian/doc/make.md b/hadrian/doc/make.md index b047baed1d..6d20d42503 100644 --- a/hadrian/doc/make.md +++ b/hadrian/doc/make.md @@ -141,17 +141,6 @@ time you fire up a build. This is not possible with the Make build system. all the options that hadrian supports and what they correspond to in the Make build system. -- Generate the `platformConstants` file to be used for stage 1/2 GHC - - ``` sh - # Make - make inplace/lib/platformConstants - - # Hadrian - build _build/stage0/lib/platformConstants - build _build/stage1/lib/platformConstants - ``` - - Generate the `settings` file to be used for stage 1/2 GHC ``` sh diff --git a/hadrian/src/Base.hs b/hadrian/src/Base.hs index 9e096f412b..205bd7518f 100644 --- a/hadrian/src/Base.hs +++ b/hadrian/src/Base.hs @@ -109,7 +109,6 @@ ghcLibDeps :: Stage -> Action [FilePath] ghcLibDeps stage = mapM (\f -> stageLibPath stage <&> (-/- f)) [ "llvm-targets" , "llvm-passes" - , "platformConstants" , "settings" ] diff --git a/hadrian/src/Settings/Builders/DeriveConstants.hs b/hadrian/src/Settings/Builders/DeriveConstants.hs index 856e85aac0..63813050b4 100644 --- a/hadrian/src/Settings/Builders/DeriveConstants.hs +++ b/hadrian/src/Settings/Builders/DeriveConstants.hs @@ -8,7 +8,6 @@ import Settings.Builders.Common deriveConstantsPairs :: [(String, String)] deriveConstantsPairs = [ ("DerivedConstants.h", "--gen-header") - , ("platformConstants", "--gen-haskell-value") ] deriveConstantsBuilderArgs :: Args diff --git a/includes/ghc.mk b/includes/ghc.mk index 7a863bdb19..00e518c34d 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -268,9 +268,6 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. includes_DERIVEDCONSTANTS = includes/dist-derivedconstants/header/DerivedConstants.h includes_GHCCONSTANTS_HASKELL_TYPE = includes/dist-derivedconstants/header/GHCConstantsHaskellType.hs -includes_GHCCONSTANTS_HASKELL_VALUE = includes/dist-derivedconstants/header/platformConstants - -INSTALL_LIBS += $(includes_GHCCONSTANTS_HASKELL_VALUE) DERIVE_CONSTANTS_FLAGS += --gcc-program "$(CC)" DERIVE_CONSTANTS_FLAGS += $(addprefix --gcc-flag$(space),$(includes_CC_OPTS) -fcommon) @@ -282,16 +279,12 @@ DERIVE_CONSTANTS_FLAGS += --target-os "$(TargetOS_CPP)" ifneq "$(BINDIST)" "YES" $(includes_DERIVEDCONSTANTS): $$(includes_H_FILES) $$(rts_H_FILES) -$(includes_GHCCONSTANTS_HASKELL_VALUE): $$(includes_H_FILES) $$(rts_H_FILES) $(includes_DERIVEDCONSTANTS): $(deriveConstants_INPLACE) $(includes_1_H_CONFIG) $(includes_1_H_PLATFORM) | $$(dir $$@)/. $< --gen-header -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) $(includes_GHCCONSTANTS_HASKELL_TYPE): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-haskell-type -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) - -$(includes_GHCCONSTANTS_HASKELL_VALUE): $(deriveConstants_INPLACE) | $$(dir $$@)/. - $< --gen-haskell-value -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) endif # --------------------------------------------------------------------------- @@ -305,7 +298,6 @@ $(eval $(call all-target,includes,\ $(includes_0_H_CONFIG) $(includes_0_H_PLATFORM) $(includes_0_H_VERSION) \ $(includes_1_H_CONFIG) $(includes_1_H_PLATFORM) $(includes_1_H_VERSION) \ $(includes_GHCCONSTANTS_HASKELL_TYPE) \ - $(includes_GHCCONSTANTS_HASKELL_VALUE) \ $(includes_DERIVEDCONSTANTS))) install: install_includes |