summaryrefslogtreecommitdiff
path: root/compiler/ghci
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-06-03 18:51:17 -0400
committerBen Gamari <ben@well-typed.com>2019-06-12 17:58:27 -0400
commit27eb7abf65af1be9c4822848c5be9e324ffbe7f4 (patch)
tree901c3085cefc34b9850e8d4777783098df84b4b7 /compiler/ghci
parent7b751ed89a97545e9ff9c9814a3d5440a8d42d64 (diff)
downloadhaskell-wip/T16738.tar.gz
Maintain separate flags for C++ compiler invocationswip/T16738
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.hs2
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 ]