[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
135/217: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.
From: |
guix-commits |
Subject: |
135/217: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. |
Date: |
Sun, 14 Nov 2021 19:21:04 -0500 (EST) |
vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit fc243f87023420f989fbadcc8d2bfdd8c30021ca
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 use 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 9e5e516..1f55ab9 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" ,lld-as-ld-wrapper)
("ninja" ,ninja)
("node" ,node-lts)
("pkg-config" ,pkg-config)
- 113/217: gnu: gusb-minimal: Introduce minimal variant., (continued)
- 113/217: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/14
- 109/217: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/11/14
- 117/217: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/14
- 121/217: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/11/14
- 124/217: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/11/14
- 125/217: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/11/14
- 126/217: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/11/14
- 127/217: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/14
- 133/217: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/11/14
- 136/217: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/11/14
- 135/217: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.,
guix-commits <=
- 137/217: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/14
- 141/217: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/11/14
- 142/217: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/11/14
- 150/217: gnu: curl: Update to 7.79.1., guix-commits, 2021/11/14
- 146/217: gnu: nspr: Normalize inputs., guix-commits, 2021/11/14
- 144/217: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/11/14
- 149/217: gnu: meson: Update to 0.60.0., guix-commits, 2021/11/14
- 148/217: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/11/14
- 157/217: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/11/14
- 154/217: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/11/14