[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
134/169: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrap
From: |
guix-commits |
Subject: |
134/169: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper. |
Date: |
Thu, 28 Oct 2021 02:08:57 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 3a1cbdb82dae2ced6066f10c2ad83cbf6444ce0b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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 <brettg@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@@ -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")
- 121/169: gnu: util-linux: Globally disable the lsns test., (continued)
- 121/169: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/28
- 122/169: gnu: heimdal: Fix build., guix-commits, 2021/10/28
- 123/169: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/28
- 125/169: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/10/28
- 124/169: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/28
- 126/169: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/28
- 127/169: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/28
- 129/169: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/28
- 130/169: gnu: webkitgtk: Update to 2.34.1., guix-commits, 2021/10/28
- 131/169: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/28
- 134/169: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper.,
guix-commits <=
- 135/169: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/28
- 136/169: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/28
- 137/169: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/28
- 139/169: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/28
- 142/169: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/28
- 113/169: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/28
- 146/169: gnu: nspr: Normalize inputs., guix-commits, 2021/10/28
- 138/169: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/28
- 143/169: gnu: elogind: Update to 246.10., guix-commits, 2021/10/28
- 153/169: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/10/28