diff options
author | Shea Levy <shea@shealevy.com> | 2014-12-26 12:33:16 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-12-26 12:33:16 -0500 |
commit | 7e0a5c38f3564a07134d60182446fbfc0e0a257f (patch) | |
tree | 69825a13be31bcc0f5a6f5f3f37ee05fbc7b4b72 /pkgs/development/mobile | |
parent | 05edd656f6bdecde31eb0270209cfc7e2320caad (diff) | |
download | nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar.gz nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar.bz2 nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar.lz nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar.xz nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.tar.zst nixlib-7e0a5c38f3564a07134d60182446fbfc0e0a257f.zip |
More gcc->cc refs
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r-- | pkgs/development/mobile/androidenv/androidsdk.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/build-tools.nix | 12 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/platform-tools.nix | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 1ce6c1205b02..1e0df06de27f 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -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") '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index dab1b92d1e42..0f736b8c383e 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -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 ''} diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index ee65951c8c0b..c4724dd41dae 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -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 ''} ''; |