diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:25:26 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:27:55 -0800 |
commit | f3c6827373be102caae5dcbadd31e73ed60fa17f (patch) | |
tree | 9f9d57c16edc218bd590ca9956eb5227d084c33f /pkgs/development/compilers/gcl | |
parent | 16fe4be790f541d68c01897640fda11f9673b8e9 (diff) | |
download | nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.gz nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.bz2 nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.lz nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.xz nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.zst nixlib-f3c6827373be102caae5dcbadd31e73ed60fa17f.zip |
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
Diffstat (limited to 'pkgs/development/compilers/gcl')
-rw-r--r-- | pkgs/development/compilers/gcl/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 452f5c09bf5c..a31517afbeb1 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -10,9 +10,8 @@ in ( assert a.stdenv ? cc ; -assert a.stdenv.cc ? gcc ; +assert a.stdenv.cc.cc.isGNU or false ; assert a.stdenv.cc ? libc ; -assert a.stdenv.cc.gcc != null ; assert a.stdenv.cc.libc != null ; rec { @@ -37,7 +36,7 @@ rec { preBuild = a.fullDepEntry ('' sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure sed -re "s@if test -d /proc/self @if false @" -i configure - sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.gcc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile + sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.cc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile '') ["minInit" "doUnpack" "addInputs"]; /* doConfigure should be removed if not needed */ |