diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
| commit | 67c73b4e64b01657ce9ea9bb2d8c015754ef3150 (patch) | |
| tree | 7358277e028232ad5f37da0892ee2bb6860373b5 /pkgs/development/compilers/llvm/3.8 | |
| parent | 5ab499d2c753209381e721a66204fe7869d6dac9 (diff) | |
| parent | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (diff) | |
| download | nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.gz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.bz2 nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.lz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.xz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.zst nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.zip | |
Merge commit '2e56ba' from staging into master
Diffstat (limited to 'pkgs/development/compilers/llvm/3.8')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/clang/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/default.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 90b8ea2581e8..388c24e63364 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -29,7 +29,7 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; - outputs = [ "out" "python" ]; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -38,6 +38,9 @@ let ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then @@ -51,7 +54,6 @@ let enableParallelBuilding = true; passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index a660d4aea5fd..9e37f93dbddc 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -22,6 +22,8 @@ let inherit clang-tools-extra_src stdenv; }; + libclang = self.clang-unwrapped.lib; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; libstdcxxClang = ccWrapperFun { |