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/interpreters/perl/5.16/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
let
libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr";
libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
in
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
''}
'';
preBuild = lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
''
# Make Cwd work on NixOS (where we don't have a /bin/pwd).
substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
pkgs/development/interpreters/perl/5.20/default.nix
+3 -3
View File
@@ -14,7 +14,7 @@ assert enableThreading -> (stdenv ? glibc);
let
libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr";
libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
in
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
# Miniperl needs -lm. perl needs -lrt.
configureFlags =
[ "-de"
"-Dcc=gcc"
"-Dcc=cc"
"-Uinstallusrbinperl"
"-Dinstallstyle=lib/perl5"
"-Duseshrplib"
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
''}
'';
preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
''
# Make Cwd work on NixOS (where we don't have a /bin/pwd).
substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"