a421e7bd4a
The new GHC version contains a patch [1] that passes linker and compiler flags
to GCC via response files rather than directly on the command-line. This is
supposed to be beneficial on Windows and other platforms that have trouble
dealing with long argument lists. On NixOS, however, this feature breaks the
flag handling provided by gcc-wrapper [2] and therefore causes the entire GHC
build to fail.
This issue has been reported upstream at [3]. It's not clear yet how to remedy
this problem, but until we've figured that out we just don't pass compiler flags
in response files on NixOS to fix https://github.com/NixOS/nixpkgs/issues/10752.
[1] 296bc70b5f
[2] https://github.com/NixOS/nixpkgs/issues/11762
[3] https://ghc.haskell.org/trac/ghc/ticket/11147
22 lines
1,018 B
Diff
22 lines
1,018 B
Diff
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
|
|
index 8c3ab1a..47a2da7 100644
|
|
--- a/compiler/main/SysTools.hs
|
|
+++ b/compiler/main/SysTools.hs
|
|
@@ -414,7 +414,7 @@ runCc dflags args = do
|
|
args1 = map Option (getOpts dflags opt_c)
|
|
args2 = args0 ++ args1 ++ args
|
|
mb_env <- getGccEnv args2
|
|
- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env
|
|
+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env
|
|
where
|
|
-- discard some harmless warnings from gcc that we can't turn off
|
|
cc_filter = unlines . doFilter . lines
|
|
@@ -928,7 +928,7 @@ runLink dflags args = do
|
|
args1 = map Option (getOpts dflags opt_l)
|
|
args2 = args0 ++ linkargs ++ args1 ++ args
|
|
mb_env <- getGccEnv args2
|
|
- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env
|
|
+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env
|
|
where
|
|
ld_filter = case (platformOS (targetPlatform dflags)) of
|
|
OSSolaris2 -> sunos_ld_filter
|