diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-06-13 16:23:24 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-06-14 12:58:32 +0200 |
| commit | 542575ad4886ad58a1123ccae9559d8b3f3ae775 (patch) | |
| tree | 364db26e19b797d5db9475de82589b6c99a26393 /pkgs/development/compilers/llvm/git/default.nix | |
| parent | d258a6f7b4a42405d7575365a344a44895e56735 (diff) | |
| download | nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar.gz nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar.bz2 nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar.lz nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar.xz nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.tar.zst nixpkgs-542575ad4886ad58a1123ccae9559d8b3f3ae775.zip | |
llvmPackages_git: 2021-05-17 -> 2021-06-04
This also fixes the libunwind build (even with GCC 11 it fails with):
/build/source/libunwind/src/libunwind.cpp:19:5: warning: "__has_feature" is not defined, evaluates to 0 [-Wundef]
19 | #if __has_feature(address_sanitizer)
| ^~~~~~~~~~~~~
/build/source/libunwind/src/libunwind.cpp:19:18: error: missing binary operator before token "("
19 | #if __has_feature(address_sanitizer)
| ^
And the openmp build which failed with this error:
/nix/store/a4yw1svqqk4d8lhwinn9xp847zz9gfma-bash-4.4-p23/bin/bash: CLANG_TOOL-NOTFOUND: command not found
/nix/store/a4yw1svqqk4d8lhwinn9xp847zz9gfma-bash-4.4-p23/bin/bash: CLANG_TOOL-NOTFOUND: command not found
make[2]: *** [libomptarget/deviceRTLs/amdgcn/CMakeFiles/libomptarget-amdgcn-gfx906.dir/build.make:307: libomptarget/deviceRTLs/amdgcn/task.gfx906.bc] Error 127
make[2]: *** [libomptarget/deviceRTLs/amdgcn/CMakeFiles/libomptarget-amdgcn-gfx900.dir/build.make:307: libomptarget/deviceRTLs/amdgcn/task.gfx900.bc] Error 127
Diffstat (limited to 'pkgs/development/compilers/llvm/git/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index a01eddf6705..9a5d34107fb 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -21,8 +21,8 @@ let release_version = "13.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "d3676d4b666ead794fc58bbc7e07aa406dcf487a"; # When using a Git commit - rev-version = "unstable-2021-05-17"; # When using a Git commit + rev = "50c0aaed47b518beea550a6858c2967eaeaef7eb"; # When using a Git commit + rev-version = "unstable-2021-06-04"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0aw5hnlp3m21dqyqz9z8669achsfhyi7lsl17hh0j45q0qlxnmyw"; + sha256 = "1w1ahcg707yh3xiy6y28b90ag03dwjplj0bg39l4w72krqr28661"; }; llvm_meta = { @@ -257,9 +257,7 @@ let libunwind = callPackage ./libunwind { inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; openmp = callPackage ./openmp { |