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

rename occurrences of cc.gcc to cc.cc

Browse Source
This commit is contained in:
Eric Seidel
2015-01-14 20:51:58 -08:00
parent 88eae46455
commit b070eacfcd
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -31,26 +31,26 @@ stdenv.mkDerivation {
# These binaries need to find libstdc++ and libgcc_s
for i in aidl libLLVM.so
do
patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/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.cc.gcc}/lib:`pwd` $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd` $i
done
# These binaries also need zlib in addition to libstdc++
for i in zipalign
do
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
patchelf --set-rpath ${stdenv_32bit.cc.cc}/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.cc.gcc}/lib:${zlib_32bit}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i
done
''}

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

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