[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
135/140: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.
From: |
guix-commits |
Subject: |
135/140: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. |
Date: |
Sun, 17 Oct 2021 23:11:17 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 26ddc3b6a35eefbf03208bc5bb41ba0d5d0e4408
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 17 22:42:19 2021 -0400
gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.
* gnu/packages/chromium.scm (make-lld-wrapper): Delete procedure.
(ungoogled-chromium)[native-inputs]: Replace its used by lld-as-ld-wrapper.
---
gnu/packages/chromium.scm | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 534b9a4..ad4c4ee 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -460,31 +460,6 @@
`(cons "--enable-custom-modes"
,flags))))))
-;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
-;; this trick to make it wrap 'lld'.
-(define (make-lld-wrapper lld)
- (define lld-as-ld
- (computed-file "lld-ld"
- #~(begin
- (mkdir #$output)
- (mkdir (string-append #$output "/bin"))
- (symlink #$(file-append lld "/bin/lld")
- (string-append #$output "/bin/ld")))))
-
- ;; Create a wrapper for LLD that inserts appropriate -rpath entries.
- (define lld-wrapper
- (make-ld-wrapper "lld-wrapper"
- #:binutils lld-as-ld))
-
- ;; Clang looks for an 'ld.lld' executable, so we need to symlink it back.
- (computed-file "lld-wrapped"
- #~(begin
- (mkdir #$output)
- (mkdir (string-append #$output "/bin"))
- (symlink #$(file-append lld-wrapper "/bin/ld")
- (string-append #$output "/bin/lld"))
- (symlink "lld" (string-append #$output "/bin/ld.lld")))))
-
(define-public ungoogled-chromium
(package
(name "ungoogled-chromium")
@@ -848,7 +823,7 @@
("clang" ,clang-12)
("gn" ,gn)
("gperf" ,gperf)
- ("ld-wrapper" ,(make-lld-wrapper lld))
+ ("ld-wrapper" ,(force lld-as-ld-wrapper))
("ninja" ,ninja)
("node" ,node-lts)
("pkg-config" ,pkg-config)
- 16/140: gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., (continued)
- 16/140: gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/17
- 12/140: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/17
- 22/140: gnu: gst-plugins-good: Update to 1.18.4., guix-commits, 2021/10/17
- 25/140: gnu: gst-plugins-bad: Update to 1.18.4., guix-commits, 2021/10/17
- 31/140: gnu: libevdev: Update to 1.11.0., guix-commits, 2021/10/17
- 27/140: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/10/17
- 26/140: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/17
- 33/140: gnu: bluez: Update to 5.59., guix-commits, 2021/10/17
- 118/140: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/17
- 119/140: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17
- 135/140: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.,
guix-commits <=
- 113/140: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 121/140: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/17
- 52/140: Revert commits made to resolve a gdk-pixbuf+svg propagation issue., guix-commits, 2021/10/17
- 34/140: gnu: gnupg: Don't explicitly return #t from phases., guix-commits, 2021/10/17
- 66/140: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 39/140: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/17
- 57/140: gnu: Add a missing copyright., guix-commits, 2021/10/17
- 49/140: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/17
- 61/140: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/17
- 40/140: gnu: gstreamer: Update to 1.19.2., guix-commits, 2021/10/17