02/03: fixup! gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper.

[guix-commits]

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit d36761fc5d2a08e604d41f07ea089542b53789f4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Oct 18 23:37:44 2021 -0400

    fixup! gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper.
---
 gnu/packages/llvm.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 6930479..11409f5 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -998,19 +998,21 @@ components which highly leverage existing libraries in 
the larger LLVM Project."
   "Return a LLD wrapper.  When LLD-AS-LD? is true, create a 'ld' symlink that
 points to 'lld'."
   (computed-file
-   "lld-wrapper"
-   #~(begin
-       (define lld* (string-append #$(make-ld-wrapper "lld-wrapper-0"
-                                                      #:binutils lld
-                                                      #:linker "lld")
-                                   "/bin/lld"))
+   (if lld-as-ld?
+       "lld-as-ld-wrapper"
+       "lld-wrapper")
+   #~(let ((lld #$(file-append lld "/bin/lld"))
+           (lld-wrapper (string-append #$(make-ld-wrapper "lld-wrapper-0"
+                                                          #:binutils lld
+                                                          #:linker "lld")
+                                       "/bin/lld")))
        (mkdir #$output)
        (mkdir (string-append #$output "/bin"))
-       (symlink lld* (string-append #$output "/bin/lld"))
+       (symlink lld-wrapper (string-append #$output "/bin/lld"))
        ;; Clang looks for an 'ld.lld' executable.
-       (symlink lld* (string-append #$output "/bin/ld.lld"))
+       (symlink lld-wraper (string-append #$output "/bin/ld.lld"))
        (when #$lld-as-ld?
-         (symlink lld* (string-append #$output "/bin/ld"))))))
+         (symlink lld-wrapper (string-append #$output "/bin/ld"))))))
 
 ;;; FIXME: The following aliases are defined as promises since there seems to
 ;;; be a problem with using `make-ld-wrapper' at the top level.