diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-12 14:09:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 14:09:00 -0400 |
| commit | 7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9 (patch) | |
| tree | 04ba1afc13d971d0a693a407f728e0dea3d02f24 /pkgs/build-support | |
| parent | 6ebcac79f3683f5b260e4d5b7481ad5c54068f8a (diff) | |
| parent | 6794b0165846373f07d5254354a1b86709e66daf (diff) | |
| download | nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar.gz nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar.bz2 nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar.lz nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar.xz nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.tar.zst nixpkgs-7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9.zip | |
Merge pull request #59338 from matthewbauer/llvm-libc++
llvm8: support c++ in cross case
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f05b9fb2255..9569c6e78c8 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -45,9 +45,9 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then + default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" - else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then + else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then "-isystem ${libcxx}/include/c++/v1" else ""; |