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.
This commit is contained in:
parent
daa46cd151
commit
00c78f8dbc
1 changed files with 1 additions and 26 deletions
|
@ -460,31 +460,6 @@
|
||||||
`(cons "--enable-custom-modes"
|
`(cons "--enable-custom-modes"
|
||||||
,flags))))))
|
,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
|
(define-public ungoogled-chromium
|
||||||
(package
|
(package
|
||||||
(name "ungoogled-chromium")
|
(name "ungoogled-chromium")
|
||||||
|
@ -848,7 +823,7 @@
|
||||||
("clang" ,clang-12)
|
("clang" ,clang-12)
|
||||||
("gn" ,gn)
|
("gn" ,gn)
|
||||||
("gperf" ,gperf)
|
("gperf" ,gperf)
|
||||||
("ld-wrapper" ,(make-lld-wrapper lld))
|
("ld-wrapper" ,lld-as-ld-wrapper)
|
||||||
("ninja" ,ninja)
|
("ninja" ,ninja)
|
||||||
("node" ,node-lts)
|
("node" ,node-lts)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
|
|
Reference in a new issue