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

rename gcc-wrapper to cc-wrapper.

Browse Source 
also makes cc-wrapper compatible with clang in the darwin fork.
This commit is contained in:
Eric Seidel
2015-01-14 20:26:56 -08:00
parent e38c351f2b
commit 48f63c2f2e
17 changed files with 146 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+5 -5
View File
@@ -85,10 +85,10 @@ rec {
cc = if isNull gccPlain
then "/no-such-path"
else lib.makeOverridable (import ../../build-support/gcc-wrapper) {
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
nativeTools = false;
nativeLibc = false;
gcc = gccPlain;
cc = gccPlain;
libc = glibc;
inherit binutils coreutils;
name = name;
@@ -209,7 +209,7 @@ rec {
mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
gccPlain = pkgs.gcc.gcc;
gccPlain = pkgs.gcc.cc;
};
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
};
@@ -229,10 +229,10 @@ rec {
# other purposes (binutils and top-level pkgs) too.
inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders;
gcc = lib.makeOverridable (import ../../build-support/gcc-wrapper) {
gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
nativeTools = false;
nativeLibc = false;
gcc = stage4.stdenv.cc.gcc;
cc = stage4.stdenv.cc.cc;
libc = stage4.pkgs.glibc;
inherit (stage4.pkgs) binutils coreutils;
name = "";