haskell.compiler.ghcHEAD: fix patchPhase #10752
This commit is contained in:
parent
811be54156
commit
bac1189399
|
@ -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
|
|
@ -6,18 +6,18 @@ let
|
||||||
inherit (bootPkgs) ghc;
|
inherit (bootPkgs) ghc;
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
version = "8.1.20161108";
|
version = "8.1.20161109";
|
||||||
name = "ghc-${version}";
|
name = "ghc-${version}";
|
||||||
rev = "2e8463b232054b788b73e6551947a9434aa76009";
|
rev = "2e8463b232054b788b73e6551947a9434aa76009";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "git://git.haskell.org/ghc.git";
|
url = "git://git.haskell.org/ghc.git";
|
||||||
inherit rev;
|
inherit rev;
|
||||||
sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd";
|
sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
|
./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
|
||||||
];
|
];
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
|
Loading…
Reference in a new issue