apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 3a1cbdb82dae2ced6066f10c2ad83cbf6444ce0b Author: Maxim Cournoyer <[email protected]> AuthorDate: Sun Oct 17 22:41:01 2021 -0400 gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper. * gnu/packages/llvm.scm (make-lld-wrapper): New procedure. (lld-wrapper, lld-as-ld-wrapper): New variables. --- gnu/packages/llvm.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6403176..16fe6fc 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -16,8 +16,8 @@ ;;; Copyright © 2019 Brett Gilio <[email protected]> ;;; Copyright © 2020 Giacomo Leidi <[email protected]> ;;; Copyright © 2020 Jakub Kądziołka <[email protected]> -;;; Copyright © 2020 Maxim Cournoyer <[email protected]> ;;; Copyright © 2021 Maxime Devos <[email protected]> +;;; Copyright © 2020, 2021 Maxim Cournoyer <[email protected]> ;;; Copyright © 2021 Julien Lepiller <[email protected]> ;;; Copyright © 2021 Lars-Dominik Braun <[email protected]> ;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]> @@ -67,7 +67,8 @@ #:use-module (gnu packages python) #:use-module (gnu packages swig) #:use-module (gnu packages xml) - #:export (system->llvm-target)) + #:export (make-lld-wrapper + system->llvm-target)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -991,6 +992,48 @@ 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* (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'." + (package + (name (if lld-as-ld? "lld-as-ld-wrapper" "lld-wrapper")) + (version "0") + (source #f) + (build-system trivial-build-system) + (inputs `(("ld.lld-wrapper" ,(make-ld-wrapper "ld.lld-wrapper" + #:binutils lld + #:linker "ld.lld")) + ("lld-wrapper" ,(make-ld-wrapper "lld-wrapper" + #:binutils lld + #:linker "lld")))) + (arguments + (list #:builder + #~(let ((ld.lld (string-append #$(this-package-input + "ld.lld-wrapper") + "/bin/ld.lld")) + (lld (string-append #$(this-package-input "lld-wrapper") + "/bin/lld"))) + (mkdir #$output) + (mkdir (string-append #$output "/bin")) + (symlink ld.lld (string-append #$output "/bin/ld.lld")) + (symlink lld (string-append #$output "/bin/lld")) + (when #$lld-as-ld? + (symlink ld.lld (string-append #$output "/bin/ld")))))) + (synopsis "LLD linker wrapper") + (description "This is a linker wrapper for LLD; like @code{ld-wrapper}, it +wraps the linker to add any missing @code{-rpath} flags, and to detect any +misuse of libraries outside of the store.") + (home-page "https://www.gnu.org/software/guix/";) + (license license:gpl3+))) + +;;; A LLD wrapper suitable to use with -fuse-ld and GCC or with Clang. +(define-public lld-wrapper + (make-lld-wrapper lld)) + +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define-public lld-as-ld-wrapper + (make-lld-wrapper lld #:lld-as-ld? #t)) + (define-public lldb (package (name "lldb")
