diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-06 23:33:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 23:33:45 +0100 |
| commit | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (patch) | |
| tree | 8fbe7df61ec8e3e4379f936052460d9efb766415 | |
| parent | 63b81752815adb745adb2f404b9af2a60f615532 (diff) | |
| parent | 64e4c98a7f3a04d9d52a9d477dafc9fe2cc9798c (diff) | |
| download | nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar.gz nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar.bz2 nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar.lz nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar.xz nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.tar.zst nixlib-335ae386741f74c63cf3bf4b7022a1e5e5f26066.zip | |
Merge pull request #33871 from dtzWill/fix/llvm-5-python-closure
llvm-5: add extra 'python' output for opt-viewer tool
| -rw-r--r-- | pkgs/development/compilers/llvm/5/llvm.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 1f55e6c54e7d..1067fa886bcb 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation (rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - outputs = [ "out" ] + outputs = [ "out" "python" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python ] @@ -120,7 +120,11 @@ in stdenv.mkDerivation (rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableSharedLibraries '' + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ |