ghcHEAD: Add back response files patch

This commit is contained in:
Shea Levy 2016-11-17 01:05:21 -05:00
parent d0d3330866
commit da547f7961
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,20 @@
--- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500
+++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500
@@ -421,7 +421,7 @@
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
@@ -911,7 +911,7 @@
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

View file

@ -27,6 +27,10 @@ in stdenv.mkDerivation (rec {
sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
};
# This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but
# see http://hydra.cryp.to/build/2061608/nixlog/1/raw
patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ];
postPatch = ''
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID