ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Enabling support of ld-linux-armhf.so.3 ld.so, in ARM

Browse Source 
I use wildcards.
This commit is contained in:
Lluís Batlle i Rossell 2012-12-29 14:14:53 +00:00
parent a8dedfc1d0
commit 29fdf278ce
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/gcc-wrapper/builder.sh
View File

@ -31,7 +31,7 @@ if test -z "$nativeLibc"; then
# The dynamic linker is passed in `ldflagsBefore' to allow # The dynamic linker is passed in `ldflagsBefore' to allow
# explicit overrides of the dynamic linker by callers to gcc/ld # explicit overrides of the dynamic linker by callers to gcc/ld
# (the *last* value counts, so ours should come first). # (the *last* value counts, so ours should come first).
echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before
fi fi
if test -n "$nativeTools"; then if test -n "$nativeTools"; then

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

@ -85,7 +85,8 @@ stdenv.mkDerivation ({
if !nativeLibc then if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.isArm then "ld-linux.so.3" else # ARM with a wildcard, which can be "" or "-armhf".
if stdenv.isArm then "ld-linux*.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else if stdenv.system == "mips64el-linux" 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")