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

More gcc->cc refs

This commit is contained in:
Shea Levy 2014-12-26 12:33:16 -05:00
parent 05edd656f6
commit 7e0a5c38f3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i
done
${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''

12
pkgs/development/mobile/androidenv/build-tools.nix
View File

@ -25,32 +25,32 @@ stdenv.mkDerivation {
# Patch the interpreter
for i in aapt aidl dexdump llvm-rs-cc
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
done
# These binaries need to find libstdc++ and libgcc_s
for i in aidl libLLVM.so
do
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i
done
# These binaries need to find libstdc++, libgcc_s and libraries in the current folder
for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc
do
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:`pwd` $i
done
# These binaries also need zlib in addition to libstdc++
for i in zipalign
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i
done
# These binaries need to find libstdc++, libgcc_s, and zlib
for i in aapt dexdump
do
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i
done
''}

4
pkgs/development/mobile/androidenv/platform-tools.nix
View File

@ -28,8 +28,8 @@ stdenv.mkDerivation {
''
for i in adb fastboot
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i
done
''}
'';

2
pkgs/top-level/all-packages.nix
View File

@ -5987,7 +5987,7 @@ let
# The logic behind this attribute is broken: libiconvOrNull==null does
# NOT imply libiconv=glibc! On Darwin, for example, we have a native
# libiconv library which is not glibc.
libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv;
libiconvOrLibc = if libiconvOrNull == null then stdenv.cc.libc else libiconv;
# On non-GNU systems we need GNU Gettext for libintl.
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;