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

* wrapGCC: pass the right purity options for the platform.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8710
This commit is contained in:
Eelco Dolstra 2007-05-16 15:15:46 +00:00
parent 62b0dddf0e
commit d3b29d16a0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -20,12 +20,14 @@ stdenv.mkDerivation {
ldWrapper = ./ld-wrapper.sh; ldWrapper = ./ld-wrapper.sh;
utils = ./utils.sh; utils = ./utils.sh;
addFlags = ./add-flags; addFlags = ./add-flags;
inherit nativeTools nativeLibc nativePrefix gcc libc binutils; inherit nativeTools nativeLibc nativePrefix gcc libc binutils;
name = if name == "" then gcc.name else name; name = if name == "" then gcc.name else name;
langC = if nativeTools then true else gcc.langC; langC = if nativeTools then true else gcc.langC;
langCC = if nativeTools then true else gcc.langCC; langCC = if nativeTools then true else gcc.langCC;
langF77 = if nativeTools then false else gcc.langF77; langF77 = if nativeTools then false else gcc.langF77;
shell = if shell == "" then stdenv.shell else shell; shell = if shell == "" then stdenv.shell else shell;
meta = if gcc != null && (gcc ? meta) then gcc.meta else meta = if gcc != null && (gcc ? meta) then gcc.meta else
{ description = "System C compiler wrapper"; { description = "System C compiler wrapper";
}; };

8
pkgs/top-level/all-packages.nix
View File

@ -844,16 +844,16 @@ rec {
}; };
wrapGCC = baseGCC: import ../build-support/gcc-wrapper { wrapGCC = baseGCC: import ../build-support/gcc-wrapper {
nativeTools = false; nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
nativeLibc = false; nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
gcc = baseGCC; gcc = baseGCC;
libc = glibc; libc = glibc;
inherit stdenv binutils; inherit stdenv binutils;
}; };
wrapGCCNew = baseGCC: import ../build-support/gcc-wrapper-new { wrapGCCNew = baseGCC: import ../build-support/gcc-wrapper-new {
nativeTools = false; nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
nativeLibc = false; nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
gcc = baseGCC; gcc = baseGCC;
libc = glibc; libc = glibc;
inherit stdenv binutils; inherit stdenv binutils;