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

Merge pull request #59338 from matthewbauer/llvm-libc++

Browse Source 
llvm8: support c++ in cross case
This commit is contained in:
Matthew Bauer
2019-04-12 14:09:00 -04:00
committed by GitHub
parent 6ebcac79f3 6794b01658
commit 7edf2db0fd
12 changed files with 633 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -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 "";