diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-26 10:17:57 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-26 22:45:15 -0500 |
| commit | 77550df8e68b5034d6a434c709be69adee1940cc (patch) | |
| tree | 9c3a0b45550672b95708aae47ea3233959e61cf1 /pkgs/development/compilers | |
| parent | cb14f1404a4d44c97f8c3003f075ae6a21cc9e63 (diff) | |
| download | nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar.gz nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar.bz2 nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar.lz nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar.xz nixlib-77550df8e68b5034d6a434c709be69adee1940cc.tar.zst nixlib-77550df8e68b5034d6a434c709be69adee1940cc.zip | |
cc-wrapper: add libcxx for libcxxClang
clang needs to find headers + libraries for compiling with libc++. We need to add a libcxx argument to cc-wrapper. This means you do not have to pass in c++ headers directly. This resolves the last case remaining of #30670. Darwin clang++ now works properly. Fixes #30670
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/7/default.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 68ee80fa7a62..6807240df81e 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 5ee551f6b6b1..ae51c19ec728 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 47c6e9e383f3..3f1192d96263 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi |