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 /hadrian/src/Rules | |
| 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 'hadrian/src/Rules')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index b167cd1a00..0c35e85dd7 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -290,6 +290,7 @@ generateSettings = do , ("dllwrap command", settingsFileSetting SettingsFileSetting_DllWrapCommand) , ("windres command", settingsFileSetting SettingsFileSetting_WindresCommand) , ("libtool command", settingsFileSetting SettingsFileSetting_LibtoolCommand) + , ("unlit command", ("$topdir/bin/" <>) . takeFileName <$> builderPath Unlit) , ("cross compiling", flag' CrossCompiling) , ("target os", lookupValueOrError configFile "haskell-target-os") , ("target arch", lookupValueOrError configFile "haskell-target-arch") @@ -335,7 +336,6 @@ generateConfigHs = do cGhcWithSMP <- expr $ yesNo <$> ghcWithSMP cGhcEnableTablesNextToCode <- expr $ yesNo <$> ghcEnableTablesNextToCode cLeadingUnderscore <- expr $ yesNo <$> flag LeadingUnderscore - cGHC_UNLIT_PGM <- fmap takeFileName $ getBuilderPath Unlit cLibFFI <- expr useLibFFIForAdjustors rtsWays <- getRtsWays cGhcRtsWithLibdw <- getFlag WithLibdw @@ -393,8 +393,6 @@ generateConfigHs = do , "cGhcEnableTablesNextToCode = " ++ show cGhcEnableTablesNextToCode , "cLeadingUnderscore :: String" , "cLeadingUnderscore = " ++ show cLeadingUnderscore - , "cGHC_UNLIT_PGM :: String" - , "cGHC_UNLIT_PGM = " ++ show cGHC_UNLIT_PGM , "cLibFFI :: Bool" , "cLibFFI = " ++ show cLibFFI , "cGhcThreaded :: Bool" |