public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: Remove two tiny old cross hacks

Browse Source 
- Name is already suffixed

 - Env vars are already exported
This commit is contained in:
John Ericson 2018-01-26 20:47:55 -05:00 committed by John Ericson
parent 7f1c5a124c
commit 7d0d12e3e0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/glibc/common.nix
View File

@ -155,8 +155,7 @@ stdenv.mkDerivation ({
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
{ {
name = name + "-${version}${patchSuffix}" + name = name + "-${version}${patchSuffix}";
lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
@ -190,11 +189,6 @@ stdenv.mkDerivation ({
libc_cv_c_cleanup=yes libc_cv_c_cleanup=yes
libc_cv_gnu89_inline=yes libc_cv_gnu89_inline=yes
EOF EOF
export BUILD_CC=gcc
export CC="$crossConfig-gcc"
export AR="$crossConfig-ar"
export RANLIB="$crossConfig-ranlib"
''; '';
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";