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 /compiler/ghci | |
| 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 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/Linker.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs index 4f938a9a5f..e26dcce1ee 100644 --- a/compiler/ghci/Linker.hs +++ b/compiler/ghci/Linker.hs @@ -343,7 +343,7 @@ linkCmdLineLibs' hsc_env pls = -- Add directories to library search paths, this only has an effect -- on Windows. On Unix OSes this function is a NOP. - let all_paths = let paths = takeDirectory (fst $ pgm_c dflags) + let all_paths = let paths = takeDirectory (pgm_c dflags) : framework_paths ++ lib_paths_base ++ [ takeDirectory dll | DLLPath dll <- libspecs ] |