[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.
From: |
guix-commits |
Subject: |
135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. |
Date: |
Tue, 26 Oct 2021 23:52:42 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 3571db68b62fff3509eef82b146c57e45abcb743
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 534b9a4..2d67182 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)
- 104/149: build: glib-or-gtk-build-system: Fix indentation., (continued)
- 104/149: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/26
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/26
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 121/149: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/26
- 117/149: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/26
- 122/149: gnu: heimdal: Fix build., guix-commits, 2021/10/26
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.,
guix-commits <=
- 138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/26
- 88/149: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/26
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/26
- 136/149: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/26
- 137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/26
- 132/149: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/26