Merge pull request #94559 from wjlroe/fix-zig-0.6.0

zig: fix build
2020-08-03 23:15:38 -05:00 · 2020-08-03 23:15:38 -05:00 · c2a3988d6c
parent 87e39d444c d51340f27f
commit c2a3988d6c
2 changed files with 0 additions and 17 deletions
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@ -20,13 +20,6 @@ llvmPackages.stdenv.mkDerivation rec {
    zlib
  ];

-  patches = [
-    (substituteAll {
-        src = ./llvm10_polly.patch;
-        llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so";
-    })
-  ];
-
  preBuild = ''
    export HOME=$TMPDIR;
  '';
--- a/pkgs/development/compilers/zig/llvm10_polly.patch
+++ b/pkgs/development/compilers/zig/llvm10_polly.patch
@ -1,10 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 97608cddf..e451c0711 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC
-     ${CLANG_LIBRARIES}
-     ${LLD_LIBRARIES}
-     ${LLVM_LIBRARIES}
-+    @llvm_extras@
- )