summaryrefslogtreecommitdiff
path: root/mk/config.mk.in
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-06-03 18:51:17 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-13 23:34:41 -0400
commit7bc5d6c6578ab9d60a83b81c7cc14819afef32ba (patch)
tree63c2e2e2669a48965c5508a3787b62b14837889a /mk/config.mk.in
parent5ce63d52fed05371edb34b4f330c33bc85a45127 (diff)
downloadhaskell-7bc5d6c6578ab9d60a83b81c7cc14819afef32ba.tar.gz
Maintain separate flags for C++ compiler invocations
Previously we would pass flags intended for the C compiler to the C++ compiler (see #16738). This would cause, for instance, `-std=gnu99` to be passed to the C++ compiler, causing spurious test failures. Fix this by maintaining a separate set of flags for C++ compilation invocations.
Diffstat (limited to 'mk/config.mk.in')
-rw-r--r--mk/config.mk.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index e2712796ce..10326d0c25 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -510,6 +510,7 @@ SettingsCCompilerCommand = @SettingsCCompilerCommand@
SettingsHaskellCPPCommand = @SettingsHaskellCPPCommand@
SettingsHaskellCPPFlags = @SettingsHaskellCPPFlags@
SettingsCCompilerFlags = @SettingsCCompilerFlags@
+SettingsCxxCompilerFlags = @SettingsCxxCompilerFlags@
SettingsCCompilerLinkFlags = @SettingsCCompilerLinkFlags@
SettingsCCompilerSupportsNoPie = @SettingsCCompilerSupportsNoPie@
SettingsLdCommand = @SettingsLdCommand@