diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-27 13:55:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 13:55:18 -0500 |
| commit | bb3683d7782756216fe35f3c5dbf888cd84d428c (patch) | |
| tree | 5e10cdda904537ac14231e70dcac9be0f2b88dc0 /pkgs/development/compilers | |
| parent | 92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293 (diff) | |
| parent | 77550df8e68b5034d6a434c709be69adee1940cc (diff) | |
| download | nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar.gz nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar.bz2 nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar.lz nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar.xz nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.tar.zst nixlib-bb3683d7782756216fe35f3c5dbf888cd84d428c.zip | |
Merge pull request #54624 from matthewbauer/libcxx
cc-wrapper: add libcxx for libcxxClang
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 |