summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-04-03 09:32:05 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-04-30 20:29:31 -0400
commitd37d91e9a444a7822eef1558198d21511558515e (patch)
tree478d7a0bf63e91ac8901f0c277dbe29136b1665b /mk
parent014ed644eea9037427c1ebeaac16189b00f9dbc7 (diff)
downloadhaskell-d37d91e9a444a7822eef1558198d21511558515e.tar.gz
Generate settings by make/hadrian instead of configure
This allows it to eventually become stage-specific
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in37
1 files changed, 37 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 79191af52e..6abf01816f 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -488,6 +488,43 @@ endif
GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
#-----------------------------------------------------------------------------
+# Settings
+
+# We are in the process of moving the settings file from being entirely
+# generated by configure, to generated being by the build system. Many of these
+# might become redundant.
+
+GccExtraViaCOpts = @GccExtraViaCOpts@
+LdHasFilelist = @LdHasFilelist@
+ArArgs = @ArArgs@
+HaskellTargetOs = @HaskellTargetOs@
+HaskellTargetArch = @HaskellTargetArch@
+TargetWordSize = @TargetWordSize@
+HaskellHaveGnuNonexecStack = @HaskellHaveGnuNonexecStack@
+HaskellHaveIdentDirective = @HaskellHaveIdentDirective@
+HaskellHaveSubsectionsViaSymbols = @HaskellHaveSubsectionsViaSymbols@
+HaskellHaveRTSLinker = @HaskellHaveRTSLinker@
+Unregisterised = @Unregisterised@
+
+SettingsCCompilerCommand = @SettingsCCompilerCommand@
+SettingsHaskellCPPCommand = @SettingsHaskellCPPCommand@
+SettingsHaskellCPPFlags = @SettingsHaskellCPPFlags@
+SettingsCCompilerFlags = @SettingsCCompilerFlags@
+SettingsCCompilerLinkFlags = @SettingsCCompilerLinkFlags@
+SettingsCCompilerSupportsNoPie = @SettingsCCompilerSupportsNoPie@
+SettingsLdCommand = @SettingsLdCommand@
+SettingsLdFlags = @SettingsLdFlags@
+SettingsArCommand = @SettingsArCommand@
+SettingsRanlibCommand = @SettingsRanlibCommand@
+SettingsDllWrapCommand = @SettingsDllWrapCommand@
+SettingsWindresCommand = @SettingsWindresCommand@
+SettingsLibtoolCommand = @SettingsLibtoolCommand@
+SettingsTouchCommand = @SettingsTouchCommand@
+SettingsClangCommand = @SettingsClangCommand@
+SettingsLlcCommand = @SettingsLlcCommand@
+SettingsOptCommand = @SettingsOptCommand@
+
+#-----------------------------------------------------------------------------
# C compiler
#
# NB. Don't override $(CC) using build.mk, re-configure using