diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 21:18:29 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 21:36:19 -0400 |
| commit | 295315cc87acd13caa39ea87c1d8d010e7a587df (patch) | |
| tree | 3b172dc6ccb3e081ffe2c27001beb868486ef0f8 /pkgs/development/compilers/gcc/5 | |
| parent | 85b4d30c0b464f6431eac6c50687111cfc69eb22 (diff) | |
| download | nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.gz nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.bz2 nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.lz nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.xz nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.zst nixlib-295315cc87acd13caa39ea87c1d8d010e7a587df.zip | |
binutilsCross: Remove and use `binutils` instead always
See previous commit for what was done to `binutils` to make this possible. There were some uses of `forcedNativePackages` added. The combination of overrides with that attribute is highly spooky: it's often important that if an overridden package comes from it, the replaced arguments for that package come from it. Long term this package set and all the spookiness should be gone and irrelevant: "Move along, nothing to see here!" No hashes should be changed with this commit
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f7d46deebcc7..25053542678a 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -26,7 +26,6 @@ , enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" , cross ? null -, binutilsCross ? null , libcCross ? null , crossStageStatic ? true , gnat ? null @@ -176,8 +175,8 @@ let version = "5.4.0"; else " --with-headers=${getDev libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( - " --with-as=${binutilsCross}/bin/${cross.config}-as" + - " --with-ld=${binutilsCross}/bin/${cross.config}-ld" + " --with-as=${binutils}/bin/${cross.config}-as" + + " --with-ld=${binutils}/bin/${cross.config}-ld" )) + " --enable-__cxa_atexit" + " --enable-long-long" + @@ -309,7 +308,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (cross != null) [binutils]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) |