From e165a2492d73d37c8b95d6970d453b9d88911ee6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jul 2020 19:35:53 +0200 Subject: 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 7955981261..d828c25bc2 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -423,21 +423,21 @@ (define xcb-proto/python2 ;; '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 @@ (define-public ungoogled-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) -- cgit v1.2.3