[Git][ghc/ghc][master] settings.in: Reformat

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
f5604d37 by John Ericson at 2019-04-08T19:24:43Z
settings.in: Reformat

We're might be about to switch to generating it in Hadrian/Make. This
reformat makes it easier to programmingmatically generate and end up
with the exact same thing, which is good for diffing to ensure no
regressions.

I had this as part of !712, but given the difficulty of satisfying CI, I
figured I should break things up even further.

- - - - -


1 changed file:

- settings.in


Changes:

=====================================
settings.in
=====================================
@@ -1,35 +1,34 @@
-[("GCC extra via C opts", "@GccExtraViaCOpts@"),
- ("C compiler command", "@SettingsCCompilerCommand@"),
- ("C compiler flags", "@SettingsCCompilerFlags@"),
- ("C compiler link flags", "@SettingsCCompilerLinkFlags@"),
- ("C compiler supports -no-pie", "@SettingsCCompilerSupportsNoPie@"),
- ("Haskell CPP command","@SettingsHaskellCPPCommand@"),
- ("Haskell CPP flags","@SettingsHaskellCPPFlags@"),
- ("ld command", "@SettingsLdCommand@"),
- ("ld flags", "@SettingsLdFlags@"),
- ("ld supports compact unwind", "@LdHasNoCompactUnwind@"),
- ("ld supports build-id", "@LdHasBuildId@"),
- ("ld supports filelist", "@LdHasFilelist@"),
- ("ld is GNU ld", "@LdIsGNULd@"),
- ("ar command", "@SettingsArCommand@"),
- ("ar flags", "@ArArgs@"),
- ("ar supports at file", "@ArSupportsAtFile@"),
- ("ranlib command", "@SettingsRanlibCommand@"),
- ("touch command", "@SettingsTouchCommand@"),
- ("dllwrap command", "@SettingsDllWrapCommand@"),
- ("windres command", "@SettingsWindresCommand@"),
- ("libtool command", "@SettingsLibtoolCommand@"),
- ("cross compiling", "@CrossCompiling@"),
- ("target os", "@HaskellTargetOs@"),
- ("target arch", "@HaskellTargetArch@"),
- ("target word size", "@TargetWordSize@"),
- ("target has GNU nonexec stack", "@HaskellHaveGnuNonexecStack@"),
- ("target has .ident directive", "@HaskellHaveIdentDirective@"),
- ("target has subsections via symbols", "@HaskellHaveSubsectionsViaSymbols@"),
- ("target has RTS linker", "@HaskellHaveRTSLinker@"),
- ("Unregisterised", "@Unregisterised@"),
- ("LLVM llc command", "@SettingsLlcCommand@"),
- ("LLVM opt command", "@SettingsOptCommand@"),
- ("LLVM clang command", "@SettingsClangCommand@")
- ]
-
+[("GCC extra via C opts", "@GccExtraViaCOpts@")
+,("C compiler command", "@SettingsCCompilerCommand@")
+,("C compiler flags", "@SettingsCCompilerFlags@")
+,("C compiler link flags", "@SettingsCCompilerLinkFlags@")
+,("C compiler supports -no-pie", "@SettingsCCompilerSupportsNoPie@")
+,("Haskell CPP command", "@SettingsHaskellCPPCommand@")
+,("Haskell CPP flags", "@SettingsHaskellCPPFlags@")
+,("ld command", "@SettingsLdCommand@")
+,("ld flags", "@SettingsLdFlags@")
+,("ld supports compact unwind", "@LdHasNoCompactUnwind@")
+,("ld supports build-id", "@LdHasBuildId@")
+,("ld supports filelist", "@LdHasFilelist@")
+,("ld is GNU ld", "@LdIsGNULd@")
+,("ar command", "@SettingsArCommand@")
+,("ar flags", "@ArArgs@")
+,("ar supports at file", "@ArSupportsAtFile@")
+,("ranlib command", "@SettingsRanlibCommand@")
+,("touch command", "@SettingsTouchCommand@")
+,("dllwrap command", "@SettingsDllWrapCommand@")
+,("windres command", "@SettingsWindresCommand@")
+,("libtool command", "@SettingsLibtoolCommand@")
+,("cross compiling", "@CrossCompiling@")
+,("target os", "@HaskellTargetOs@")
+,("target arch", "@HaskellTargetArch@")
+,("target word size", "@TargetWordSize@")
+,("target has GNU nonexec stack", "@HaskellHaveGnuNonexecStack@")
+,("target has .ident directive", "@HaskellHaveIdentDirective@")
+,("target has subsections via symbols", "@HaskellHaveSubsectionsViaSymbols@")
+,("target has RTS linker", "@HaskellHaveRTSLinker@")
+,("Unregisterised", "@Unregisterised@")
+,("LLVM llc command", "@SettingsLlcCommand@")
+,("LLVM opt command", "@SettingsOptCommand@")
+,("LLVM clang command", "@SettingsClangCommand@")
+]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/f5604d3709d015f4085843a92298af3e53c08d36

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/f5604d3709d015f4085843a92298af3e53c08d36
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190408/20c72bdd/attachment-0001.html>