diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-03-05 12:34:01 +0100 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2020-03-07 20:11:59 +0100 |
| commit | 3a84353edb56a6167fb687f2fdc32cab48a65079 (patch) | |
| tree | 7d29e03dad7546f22a3fd4f0e6aa4c884dc4cada /pkgs/development/compilers/llvm/10/llvm.nix | |
| parent | 065b6d3ce452dcc7ec631bbc7c0e67e9f0993518 (diff) | |
| download | nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.gz nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.bz2 nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.lz nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.xz nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.zst nixlib-3a84353edb56a6167fb687f2fdc32cab48a65079.zip | |
llvmPackages_10: rc2 -> rc3
http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html Additionally cherry-picked 3 commits from `llvm-project/master`: - llvm/llvm-project@d21664c - llvm/llvm-project@3a0f6e6 - llvm/llvm-project@87dac7d such that clang can automatically pick up the polly plugin from the `llvm-polly` build.
Diffstat (limited to 'pkgs/development/compilers/llvm/10/llvm.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/10/llvm.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 4496b5abcf45..eb93d8648f9a 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "01azqqygm83s6l1g35kqkc7da06dkc8jxpb4zsd420lmhfhw4gws"; - polly_src = fetch "polly" "00nvnh0jhi1s5gcyfnb30h9g2j18z79kipiy878bkawg53f4z2xf"; + src = fetch pname "1pa322iwqg071gxdn5wxri263j6aki6ag36xbdzbyi3g8m8v8jci"; + polly_src = fetch "polly" "0p9dmv4hxwx4f5k1v4r9b5jp7fbi71ajpmrv3xf3vmp6m4i3r0pc"; unpackPhase = '' unpackFile $src @@ -54,6 +54,11 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + # 10.0.0rc3-only + ./llvm-extension-handling.patch + ]; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ |