summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-11-13 03:59:48 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-11-27 19:47:09 +0000
commitf67060c6dcc2ba14949ab5e8a4ffe46bceadc14f (patch)
tree84b5821d2fa4ca215c6e1b0b03024059fd3ee7b7 /mk
parent88481c942a24e8ffa1705fc51b0bc900ca311ea7 (diff)
downloadhaskell-f67060c6dcc2ba14949ab5e8a4ffe46bceadc14f.tar.gz
Make ambient MinGW support a proper settings
Get rid of `USE_INPLACE_MINGW_TOOLCHAIN` and use a settings file entry instead. The CPP setting was originally introduced in f065b6b012.
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in1
-rw-r--r--mk/project.mk.in1
2 files changed, 1 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 18199bddd2..6cdd6c07af 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -487,6 +487,7 @@ SettingsTouchCommand = @SettingsTouchCommand@
SettingsClangCommand = @SettingsClangCommand@
SettingsLlcCommand = @SettingsLlcCommand@
SettingsOptCommand = @SettingsOptCommand@
+SettingsUseDistroMINGW = @SettingsUseDistroMINGW@
#-----------------------------------------------------------------------------
# C compiler
diff --git a/mk/project.mk.in b/mk/project.mk.in
index 4f82b1607a..bf79614c24 100644
--- a/mk/project.mk.in
+++ b/mk/project.mk.in
@@ -127,7 +127,6 @@ BuildVendor_CPP = @BuildVendor_CPP@
# Valid options: YES/NO
#
LeadingUnderscore=@LeadingUnderscore@
-SettingsUseDistroMINGW=@SettingsUseDistroMINGW@
# Pin a suffix on executables? If so, what (Windows only).
exeext0=@exeext_host@