diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-07 09:43:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-07 09:43:38 +0100 |
commit | e66a5f886293c649e4ce01170b24922abb3b468b (patch) | |
tree | c60fb80842244a812c65f2f6b26e382f3a726d26 /pkgs/development/compilers/llvm/4 | |
parent | 4e6a9f04db69eaa83a6b00fd7c10bd55462c18be (diff) | |
parent | b0c043d26c7ecebe737c7a03d87a732f1285d993 (diff) | |
download | nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar.gz nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar.bz2 nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar.lz nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar.xz nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.tar.zst nixlib-e66a5f886293c649e4ce01170b24922abb3b468b.zip |
Merge pull request #33342 from LnL7/clang-outputs
clang: add lib output
Diffstat (limited to 'pkgs/development/compilers/llvm/4')
-rw-r--r-- | pkgs/development/compilers/llvm/4/clang/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 8d40ee3c8aa2..404b65c56ab7 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -49,7 +49,7 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - outputs = [ "out" "python" ] + outputs = [ "out" "lib" "python" ] ++ stdenv.lib.optional enableManpages "man"; # Clang expects to find LLVMgold in its own prefix @@ -59,13 +59,15 @@ let ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_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 mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang - rm $out/bin/c-index-test '' + stdenv.lib.optionalString enableManpages '' @@ -79,7 +81,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/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 5a44cb868253..89cb181e405e 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -34,6 +34,7 @@ let llvm = overrideManOutput llvm; clang-unwrapped = overrideManOutput clang-unwrapped; + libclang = self.clang-unwrapped.lib; llvm-manpages = lowPrio self.llvm.man; clang-manpages = lowPrio self.clang-unwrapped.man; |