diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-12 15:36:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-13 11:16:10 -0400 |
| commit | 5aec3f96a26806dc26759bc2f13b062caaad3c17 (patch) | |
| tree | a25ad6b59b59dfa7686c04398ed2527c3a16a7b6 /pkgs/development/compilers/llvm | |
| parent | 741839a687b5ecad445dbb7afb87ceeacdde2d6b (diff) | |
| download | nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.gz nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.bz2 nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.lz nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.xz nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.tar.zst nixlib-5aec3f96a26806dc26759bc2f13b062caaad3c17.zip | |
treewide: Use `*Platform.extensions`
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 654e1ce0023b..2cdbef4b5b84 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -26,7 +26,6 @@ assert (hostPlatform != buildPlatform) -> !enableSharedLibraries; let src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; - shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -124,7 +123,7 @@ in stdenv.mkDerivation rec { postInstall = "" + stdenv.lib.optionalString (enableSharedLibraries) '' moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM.${shlib}" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 4978570334ea..a5aa810fb80d 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -23,7 +23,6 @@ let src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; - shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -115,7 +114,7 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM.${shlib}" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' |