dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #33500 from dtzWill/fix/gcc-wrapper-old-dynamiclinker

Browse Source 
gcc-wrapper-old: grab name of dynamicLinker from bintools
This commit is contained in:
Orivej Desh 2018-01-06 04:06:46 +00:00 committed by GitHub
commit 728dda584b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""
, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
, zlib ? null , zlib ? null
, hostPlatform, targetPlatform , hostPlatform, targetPlatform, targetPackages
}: }:
assert nativeTools -> nativePrefix != ""; assert nativeTools -> nativePrefix != "";
@ -58,18 +58,6 @@ stdenv.mkDerivation {
zlib = if gcc != null && gcc ? langVhdl then zlib else null; zlib = if gcc != null && gcc ? langVhdl then zlib else null;
shell = shell + shell.shellPath or ""; shell = shell + shell.shellPath or "";
crossAttrs = {
#
# This is not the best way to do this. I think the reference should be
# the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
# do this sufficient if/else.
dynamicLinker =
(if hostPlatform.arch == "arm" then "ld-linux.so.3" else
if hostPlatform.arch == "mips" 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");
};
preferLocalBuild = true; preferLocalBuild = true;
meta = meta =
@ -83,17 +71,6 @@ stdenv.mkDerivation {
# The dynamic linker has different names on different platforms. # The dynamic linker has different names on different platforms.
dynamicLinker = dynamicLinker =
if !nativeLibc then if !nativeLibc then
(if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else targetPackages.stdenv.cc.bintools.dynamicLinker
if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
# ARM with a wildcard, which can be "" or "-armhf".
if targetPlatform.isArm then "ld-linux*.so.3" else
if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else
if targetPlatform.system == "powerpc-linux" then "ld.so.1" else
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 "";
} }