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 /includes/ghc.mk | |
| 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 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 27b704d140..b7bac36ba0 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -197,6 +197,7 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. @echo ',("dllwrap command", "$(SettingsDllWrapCommand)")' >> $@ @echo ',("windres command", "$(SettingsWindresCommand)")' >> $@ @echo ',("libtool command", "$(SettingsLibtoolCommand)")' >> $@ + @echo ',("unlit command", "$$topdir/bin/$(utils/unlit_dist_PROG)")' >> $@ @echo ',("cross compiling", "$(CrossCompiling)")' >> $@ @echo ',("target os", "$(HaskellTargetOs)")' >> $@ @echo ',("target arch", "$(HaskellTargetArch)")' >> $@ |