diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-02-03 14:02:59 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-03 14:02:59 -0800 |
| commit | 6f7632a7bddf32d6888780f254827cb52a3e6a90 (patch) | |
| tree | 04ea38b7f4e4df437171c0af38a0f67662c8d368 /pkgs/build-support/cc-wrapper | |
| parent | 2ca30151c20508727cce91895ce9061464bfaeae (diff) | |
| download | nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar.gz nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar.bz2 nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar.lz nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar.xz nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.tar.zst nixlib-6f7632a7bddf32d6888780f254827cb52a3e6a90.zip | |
update libcxx[abi] to 3.5
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0faec6aec21b..5d05b5eff869 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -9,7 +9,6 @@ , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [] , setupHook ? ./setup-hook.sh -, libcxx ? null, libcxxabi ? null }: with stdenv.lib; @@ -35,7 +34,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc shell libcxx libcxxabi; + inherit cc shell; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; # The wrapper scripts use 'cat', so we may need coreutils. @@ -88,7 +87,7 @@ stdenv.mkDerivation { '' + (if nativeTools then '' - ccPath="${nativePrefix}/bin" + ccPath="${if stdenv.isDarwin then cc else nativePrefix}/bin" ldPath="${nativePrefix}/bin" '' else '' echo $cc > $out/nix-support/orig-cc |