Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de3b94b24e0c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37c599fe8c00
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 6, 2017

  1. llvm_4: Fix debugVersion 

    Previously failed on installation phase
when `substituteInPlace` could not find the cmake exports file.
    @aherrmann
    aherrmann committed Jun 6, 2017
    Copy the full SHA
    1cfed62 View commit details

Commits on Jul 17, 2017

  1. Merge pull request #26429 from aherrmann/pr_llvm_4_fix_debug 

    llvm_4: Fix debugVersion
    @LnL7
    LnL7 authored Jul 17, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37c599f View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/compilers/llvm/4/llvm.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/4/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -116,11 +116,11 @@ in stdenv.mkDerivation rec {
+ stdenv.lib.optionalString enableSharedLibraries ''
moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM.${shlib}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
''
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config