diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-03 21:10:59 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-05 18:50:56 -0400 |
| commit | b55ee979d32df938eee9c4c02c189f8be267e8a1 (patch) | |
| tree | c1d1006c0ddd76f85c05a9258d687a32d2f6ce96 /hadrian/src/Rules/Generate.hs | |
| parent | f96d57b800f10ab194897133f3c0d11e4fbc71b4 (diff) | |
| download | haskell-b55ee979d32df938eee9c4c02c189f8be267e8a1.tar.gz | |
Make sure all boolean settings entries use `YES` / `NO`
Some where using `True` / `False`, a legacy of when they were in
`Config.hs`. See #16914 / d238d3062a9858 for a similar problem.
Also clean up the configure variables names for consistency and clarity
while we're at it. "Target" makes clear we are talking about outputted
code, not where GHC itself runs.
Diffstat (limited to 'hadrian/src/Rules/Generate.hs')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 8ad8ead4c7..1736405a15 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -298,10 +298,10 @@ generateSettings = do , ("target os", expr $ lookupValueOrError configFile "haskell-target-os") , ("target arch", expr $ lookupValueOrError configFile "haskell-target-arch") , ("target word size", expr $ lookupValueOrError configFile "target-word-size") - , ("target has GNU nonexec stack", expr $ lookupValueOrError configFile "haskell-have-gnu-nonexec-stack") - , ("target has .ident directive", expr $ lookupValueOrError configFile "haskell-have-ident-directive") - , ("target has subsections via symbols", expr $ lookupValueOrError configFile "haskell-have-subsections-via-symbols") - , ("target has RTS linker", expr $ lookupValueOrError configFile "haskell-have-rts-linker") + , ("target has GNU nonexec stack", expr $ lookupValueOrError configFile "target-has-gnu-nonexec-stack") + , ("target has .ident directive", expr $ lookupValueOrError configFile "target-has-ident-directive") + , ("target has subsections via symbols", expr $ lookupValueOrError configFile "target-has-subsections-via-symbols") + , ("target has RTS linker", expr $ lookupValueOrError configFile "target-has-rts-linker") , ("Unregisterised", expr $ yesNo <$> flag GhcUnregisterised) , ("LLVM target", getSetting LlvmTarget) , ("LLVM llc command", expr $ settingsFileSetting SettingsFileSetting_LlcCommand) |