diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-17 22:42:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:19 -0500 |
| commit | 00c78f8dbcfeee1bbfdace72f0cc73e8b2035929 (patch) | |
| tree | 6aa5fe140998c3e464f0c9dc3385980b5bc92388 /gnu/packages | |
| parent | daa46cd151657ac4df991bf6651d46aae739fcef (diff) | |
| download | guix-00c78f8dbcfeee1bbfdace72f0cc73e8b2035929.tar guix-00c78f8dbcfeee1bbfdace72f0cc73e8b2035929.tar.gz | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/chromium.scm | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 9e5e516af5..1f55ab9602 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) |