branch master updated: gnu: ungoogled-chromium: Avoid top-level reference to LLD.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e165a24  gnu: ungoogled-chromium: Avoid top-level reference to LLD.
e165a24 is described below

commit e165a2492d73d37c8b95d6970d453b9d88911ee6
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jul 23 19:35:53 2020 +0200

    gnu: ungoogled-chromium: Avoid top-level reference to LLD.
    
    * gnu/packages/chromium.scm (lld-as-ld, lld-wrapper, lld/wrapped): Move 
into ...
    (make-lld-wrapper): ... here.  New procedure.
---
 gnu/packages/chromium.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 7955981..d828c25 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -423,21 +423,21 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\
 
 ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
 ;; this trick to make it wrap '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.
-(define lld/wrapped
+(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)
@@ -788,7 +788,7 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\
        ("clang" ,clang-10)
        ("gn" ,gn)
        ("gperf" ,gperf)
-       ("ld-wrapper" ,lld/wrapped)
+       ("ld-wrapper" ,(make-lld-wrapper lld))
        ("ninja" ,ninja)
        ("node" ,node)
        ("pkg-config" ,pkg-config)