From 8993d9663606eeb075725daa669482d428d2356d Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 9 Jan 2022 12:26:50 +0100
Subject: gnu: zig: Build with LLD 12.

This fixes a regression introduced in a05e573d60bf64129abf4d4e5f27355c84ebb2ee
as the LLD version must match the LLVM version.

* gnu/packages/llvm.scm (lld-12): New variable.
* gnu/packages/zig.scm (zig)[inputs]: Change from LLD to LLD-12.
---
 gnu/packages/llvm.scm | 13 +++++++++++++
 gnu/packages/zig.scm  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index c7d071e155..e708c02884 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1139,6 +1139,19 @@ of programming tools as well as libraries with equivalent functionality.")
 components which highly leverage existing libraries in the larger LLVM Project.")
     (license license:asl2.0))) ; With LLVM exception
 
+(define-public lld-12
+  (package
+    (inherit lld)
+    (version "12.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (llvm-uri "lld" version))
+              (sha256
+               (base32
+                "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"))))
+    (inputs (modify-inputs (package-inputs lld)
+              (replace "llvm" llvm-12)))))
+
 (define* (make-lld-wrapper lld #:key lld-as-ld?)
   "Return a LLD wrapper.  When LLD-AS-LD? is true, create a 'ld' symlink that
 points to 'lld'."
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index ea0ec89b0b..9cd869389b 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -45,7 +45,7 @@
     (build-system cmake-build-system)
     (inputs
      (list clang-12 ; Clang propagates llvm.
-           lld))
+           lld-12))
     ;; Zig compiles fine with GCC, but also needs native LLVM libraries.
     (native-inputs
      (list llvm-12))
-- 
cgit v1.2.3