[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.
From: |
guix-commits |
Subject: |
135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. |
Date: |
Fri, 29 Oct 2021 15:57:06 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 61f2debf68302e2cab8f182725d284efb4488453
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)
- 112/180: gnu: libcloudproviders-minimal: Introduce minimal variant., (continued)
- 112/180: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 113/180: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 115/180: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/29
- 117/180: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/29
- 120/180: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/29
- 129/180: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/29
- 87/180: gnu: gdb: Normalize indentation., guix-commits, 2021/10/29
- 109/180: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 114/180: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/29
- 121/180: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/29
- 135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper.,
guix-commits <=
- 137/180: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/29
- 139/180: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/29
- 144/180: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/29
- 148/180: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/10/29
- 150/180: gnu: curl: Update to 7.79.1., guix-commits, 2021/10/29
- 97/180: gnu: Add python-flit-core., guix-commits, 2021/10/29
- 100/180: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/29
- 152/180: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/10/29
- 159/180: gnu: gstreamer: Disable the pipelines-seek test., guix-commits, 2021/10/29
- 162/180: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/10/29