diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-04-04 13:38:53 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-30 20:29:31 -0400 |
| commit | 2988ef5e0334f9841bf23d905b0363a3b8a1a660 (patch) | |
| tree | d7f14ef5ccb30adc1d57b215a37d0086392a8fa9 /compiler | |
| parent | 53d1cd9634bc788fca022309af3416831b577a81 (diff) | |
| download | haskell-2988ef5e0334f9841bf23d905b0363a3b8a1a660.tar.gz | |
Move cGHC_UNLIT_PGM to be "unlit command" in settings
The bulk of the work was done in #712, making settings be make/Hadrian
controlled. This commit then just moves the unlit command rules in
make/Hadrian from the `Config.hs` generator to the `settings` generator
in each build system.
I think this is a good change because the crucial benefit is *settings*
don't affect the build: ghc gets one baby step closer to being a regular
cabal executable, and make/Hadrian just maintains settings as part of
bootstrapping.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.mk | 2 | ||||
| -rw-r--r-- | compiler/main/SysTools.hs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 6cd774744d..69eff31330 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -110,8 +110,6 @@ endif @echo 'cGhcEnableTablesNextToCode = "$(GhcEnableTablesNextToCode)"' >> $@ @echo 'cLeadingUnderscore :: String' >> $@ @echo 'cLeadingUnderscore = "$(LeadingUnderscore)"' >> $@ - @echo 'cGHC_UNLIT_PGM :: String' >> $@ - @echo 'cGHC_UNLIT_PGM = "$(utils/unlit_dist_PROG)"' >> $@ @echo 'cLibFFI :: Bool' >> $@ ifeq "$(UseLibFFIForAdjustors)" "YES" @echo 'cLibFFI = True' >> $@ diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 5725896d6b..6eccdd7ec6 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -211,9 +211,9 @@ initSysTools top_dir ghc_usage_msg_path = installed "ghc-usage.txt" ghci_usage_msg_path = installed "ghci-usage.txt" - -- For all systems, unlit, split, mangle are GHC utilities - -- architecture-specific stuff is done when building Config.hs - unlit_path = libexec cGHC_UNLIT_PGM + -- For all systems, unlit, split, mangle are GHC utilities + -- architecture-specific stuff is done when building Config.hs + unlit_path <- getToolSetting "unlit command" windres_path <- getToolSetting "windres command" libtool_path <- getToolSetting "libtool command" |