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

Change occurrences of gcc to the more general cc

Browse Source 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
This commit is contained in:
John Wiegley
2014-12-26 11:06:21 -06:00
parent ce100a5d58
commit 28b6fb61e6
252 changed files with 553 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/androidenv/androidndk.nix
+1 -1
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
find $out \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm /0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
--set-rpath ${zlib}/lib:${ncurses}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ndk-gdb ndk-gdb-py
pkgs/development/mobile/androidenv/androidsdk.nix
+6 -6
View File
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
for i in emulator64-arm emulator64-mips emulator64-x86
do
patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $i
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.cc.gcc}/lib64 $i
done
''}
@@ -80,11 +80,11 @@ stdenv.mkDerivation rec {
# The monitor requires some more patching
cd lib/monitor-x86
patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
wrapProgram `pwd`/monitor \
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib
cd ../..
''
@@ -93,11 +93,11 @@ stdenv.mkDerivation rec {
# The monitor requires some more patching
cd lib/monitor-x86_64
patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
wrapProgram `pwd`/monitor \
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib
cd ../..
''