diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-03 18:51:17 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-13 23:34:41 -0400 |
| commit | 7bc5d6c6578ab9d60a83b81c7cc14819afef32ba (patch) | |
| tree | 63c2e2e2669a48965c5508a3787b62b14837889a /aclocal.m4 | |
| parent | 5ce63d52fed05371edb34b4f330c33bc85a45127 (diff) | |
| download | haskell-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 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 0d4727ff2b..0d564f3885 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -511,6 +511,7 @@ AC_DEFUN([FP_SETTINGS], then SettingsCCompilerCommand="$(basename $CC)" SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" + SettingsCxxCompilerFlags="$CONF_CXX_OPTS_STAGE2" SettingsHaskellCPPCommand="$(basename $HaskellCPPCmd)" SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="$(basename $LdCmd)" @@ -564,6 +565,7 @@ AC_DEFUN([FP_SETTINGS], SettingsOptCommand="$OptCmd" fi SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" + SettingsCxxCompilerFlags="$CONF_CXX_OPTS_STAGE2" SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2" SettingsCCompilerSupportsNoPie="$CONF_GCC_SUPPORTS_NO_PIE" SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2" @@ -571,6 +573,7 @@ AC_DEFUN([FP_SETTINGS], AC_SUBST(SettingsHaskellCPPCommand) AC_SUBST(SettingsHaskellCPPFlags) AC_SUBST(SettingsCCompilerFlags) + AC_SUBST(SettingsCxxCompilerFlags) AC_SUBST(SettingsCCompilerLinkFlags) AC_SUBST(SettingsCCompilerSupportsNoPie) AC_SUBST(SettingsLdCommand) |