futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* gnu/packages/chromium.scm (lld-as-ld, lld-wrapper, lld/wrapped): Move into ...
(make-lld-wrapper): ... here.  New procedure.
This commit is contained in:
Marius Bakke 2020-07-23 19:35:53 +02:00
parent 7235ce224e
commit e165a2492d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/chromium.scm
View File

@ -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")))))
(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))
;; 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
;; 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)