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

gcc-wrapper-old: Don't use stdenv.cross

Browse Source 
Take the dynamic linker logic for cc-wrapper for now
This commit is contained in:
hsloan 2017-06-28 15:59:14 -04:00 committed by John Ericson
parent da668f66c7
commit 49347667a8
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/build-support/gcc-wrapper-old/default.nix
View File

@ -8,6 +8,7 @@
{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""
, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? ""
, zlib ? null , zlib ? null
, hostPlatform, targetPlatform
}: }:
assert nativeTools -> nativePrefix != ""; assert nativeTools -> nativePrefix != "";
@ -69,9 +70,9 @@ stdenv.mkDerivation {
# the style in the gcc-cross-wrapper, but to keep a stable stdenv now I # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
# do this sufficient if/else. # do this sufficient if/else.
dynamicLinker = dynamicLinker =
(if stdenv.cross.arch == "arm" then "ld-linux.so.3" else (if hostPlatform.arch == "arm" then "ld-linux.so.3" else
if stdenv.cross.arch == "mips" then "ld.so.1" else if hostPlatform.arch == "mips" then "ld.so.1" else
if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else if stdenv.lib.hasSuffix "pc-gnu" hostPlatform.config then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform"); abort "don't know the name of the dynamic linker for this platform");
}; };
@ -85,15 +86,20 @@ stdenv.mkDerivation {
+ " (wrapper script)"; + " (wrapper script)";
}; };
# The dynamic linker has different names on different Linux platforms. # The dynamic linker has different names on different platforms.
dynamicLinker = dynamicLinker =
if !nativeLibc then if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
# ARM with a wildcard, which can be "" or "-armhf". # ARM with a wildcard, which can be "" or "-armhf".
if stdenv.isArm then "ld-linux*.so.3" else if targetPlatform.isArm32 then "ld-linux*.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else if targetPlatform.system == "powerpc-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform") if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else
if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
builtins.trace
"Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead."
null)
else ""; else "";
} }