diff options
| author | Gabor Greif <ggreif@gmail.com> | 2021-03-17 18:17:32 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-04-01 12:32:19 +0200 |
| commit | 7c27d4981556c0a0a5ca9cf0e8eeaf579538883e (patch) | |
| tree | 1a0161b4000c6f8dcb88574918c8328642005713 /pkgs/development/compilers/llvm/12/llvm.nix | |
| parent | 2fd9e4171997b18958c4dd4cb7c9e78eb42ff6c6 (diff) | |
| download | nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar.gz nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar.bz2 nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar.lz nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar.xz nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.tar.zst nixpkgs-7c27d4981556c0a0a5ca9cf0e8eeaf579538883e.zip | |
llvmPackages_12: init at 12.0.0-rc3
https://lists.llvm.org/pipermail/release-testers/2021-March/001496.html
Diffstat (limited to 'pkgs/development/compilers/llvm/12/llvm.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/12/llvm.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/12/llvm.nix b/pkgs/development/compilers/llvm/12/llvm.nix index cb44643ff78..87175b474c5 100644 --- a/pkgs/development/compilers/llvm/12/llvm.nix +++ b/pkgs/development/compilers/llvm/12/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "199yq3a214avcbi4kk2q0ajriifkvsr0l2dkx3a666m033ihi1ff"; - polly_src = fetch "polly" "031r23ijhx7v93a5n33m2nc0x9xyqmx0d8xg80z7q971p6qd63sq"; + src = fetch pname "1lpdkndjb8cxpcyjv9glqp58687j8y8cvd7r72pw6sbqkkzq86g5"; + polly_src = fetch "polly" "002a8q3lgspvqdb8fi09cl11x438x6a2d2sb026jargrx92i5vas"; unpackPhase = '' unpackFile $src @@ -69,6 +69,9 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ @@ -122,11 +125,11 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_11}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildPackages.llvm_12}/bin/llvm-tblgen" ]; postBuild = '' - rm -fR $out + rm -R $out ''; preCheck = '' @@ -171,8 +174,6 @@ in stdenv.mkDerivation (rec { make docs-llvm-man ''; - propagatedBuildInputs = []; - installPhase = '' make -C docs install ''; |