From f67060c6dcc2ba14949ab5e8a4ffe46bceadc14f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 13 Nov 2021 03:59:48 +0000
Subject: 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.
---
 mk/config.mk.in  | 1 +
 mk/project.mk.in | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk')

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@
-- 
cgit v1.2.1