diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
| commit | 553abf71ba454a724d072a650a9cb09e360b375a (patch) | |
| tree | 7f483e613f6ef62f9e3dbf51ba930e80f7cf813d /pkgs/build-support/cc-wrapper/default.nix | |
| parent | 592d4af9cf0e81907919cf954c1d0ad3089ae772 (diff) | |
| parent | 3aee39bb83337b586d0be702eb5dababc5f7ef29 (diff) | |
| download | nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.gz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.bz2 nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.lz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.xz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.zst nixlib-553abf71ba454a724d072a650a9cb09e360b375a.zip | |
Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/development/libraries/wayland/default.nix pkgs/development/tools/build-managers/cmake/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8f930eb4dc4f..ec024c72481d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -9,6 +9,7 @@ , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [] , dyld ? null # TODO: should this be a setup-hook on dyld? +, isGNU ? false, isClang ? false }: with stdenv.lib; @@ -40,7 +41,7 @@ stdenv.mkDerivation { # The wrapper scripts use 'cat', so we may need coreutils. coreutils = if nativeTools then null else coreutils; - passthru = { inherit nativeTools nativeLibc nativePrefix; }; + passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; }; buildCommand = '' |