From b070eacfcdc6be36b2d4aca7c8764cba34e7af58 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Wed, 14 Jan 2015 20:51:58 -0800
Subject: rename occurrences of cc.gcc to cc.cc

---
 maintainers/scripts/patchelf-hints.sh                 | 2 +-
 pkgs/build-support/build-fhs-chrootenv/default.nix    | 4 ++--
 pkgs/development/mobile/androidenv/androidsdk.nix     | 2 +-
 pkgs/development/mobile/androidenv/build-tools.nix    | 8 ++++----
 pkgs/development/mobile/androidenv/platform-tools.nix | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maintainers/scripts/patchelf-hints.sh b/maintainers/scripts/patchelf-hints.sh
index e6b3eeafafc..5fdfc15dc23 100755
--- a/maintainers/scripts/patchelf-hints.sh
+++ b/maintainers/scripts/patchelf-hints.sh
@@ -62,7 +62,7 @@ for bin in $(find $binaryDist -executable -type f) :; do
         )
 
         if test "$names" = "glibc"; then names="stdenv.glibc"; fi
-        if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.gcc"; fi
+        if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.cc"; fi
 
         if test $lib != $libPath; then
             interpreter="--interpreter \${$names}/lib/$lib"
diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 89dd2faf3ba..a4ba456d7a5 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -165,8 +165,8 @@ let
     cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/
 
     # copy gcc libs (and may overwrite exitsting wrongly placed libs)
-    cp -rsf ${choosenGcc.gcc}/lib/*   lib/
-    cp -rsf ${choosenGcc.gcc}/lib64/* lib64/
+    cp -rsf ${choosenGcc.cc}/lib/*   lib/
+    cp -rsf ${choosenGcc.cc}/lib64/* lib64/
   '';
 
 in stdenv.mkDerivation {
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index c969ca14332..7c854d052d6 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -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") ''
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 0f736b8c383..158d886a5e7 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -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
       ''}
       
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index c4724dd41da..ab64ad589db 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -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
     ''}
   '';
-- 
cgit 1.4.1