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 /includes | |
| 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 'includes')
| -rw-r--r-- | includes/ghc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 0d55c772e0..f5773f66c4 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -179,6 +179,7 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. @echo '[("GCC extra via C opts", "$(GccExtraViaCOpts)")' >> $@ @echo ',("C compiler command", "$(SettingsCCompilerCommand)")' >> $@ @echo ',("C compiler flags", "$(SettingsCCompilerFlags)")' >> $@ + @echo ',("C++ compiler flags", "$(SettingsCxxCompilerFlags)")' >> $@ @echo ',("C compiler link flags", "$(SettingsCCompilerLinkFlags)")' >> $@ @echo ',("C compiler supports -no-pie", "$(SettingsCCompilerSupportsNoPie)")' >> $@ @echo ',("Haskell CPP command", "$(SettingsHaskellCPPCommand)")' >> $@ |