me
/
guix
Archived
1
0
Fork 0

gnu: zig: Build with LLD 12.

This fixes a regression introduced in a05e573d60
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.
master
Marius Bakke 2022-01-09 12:26:50 +01:00
parent 796bb42c11
commit 8993d96636
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 14 additions and 1 deletions

View File

@ -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'."

View File

@ -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))