diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-26 20:47:55 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@yahoo.com> | 2018-01-26 21:01:33 -0500 |
| commit | 7d0d12e3e0a232b5e81c6a739e0b6b395b10c824 (patch) | |
| tree | dc8c2d876f6db6a5eaee486f911d8f03c413137c | |
| parent | 7f1c5a124c5eea0930fbbcb642e13c78681aee75 (diff) | |
| download | nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar.gz nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar.bz2 nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar.lz nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar.xz nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.tar.zst nixlib-7d0d12e3e0a232b5e81c6a739e0b6b395b10c824.zip | |
glibc: Remove two tiny old cross hacks
- Name is already suffixed - Env vars are already exported
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index bd116ff6f306..b17d4effb1eb 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -155,8 +155,7 @@ stdenv.mkDerivation ({ // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // { - name = name + "-${version}${patchSuffix}" + - lib.optionalString (cross != null) "-${cross.config}"; + name = name + "-${version}${patchSuffix}"; src = fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; @@ -190,11 +189,6 @@ stdenv.mkDerivation ({ libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes 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"; |