commit: a4c22a8c26d3eba78f2bb5835645c34dcb9def55 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Thu Jun 18 22:43:14 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Jun 18 23:50:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c22a8c
dev-lang/rust: un-hardcode wasm linker if system-llvm is used Bug: https://bugs.gentoo.org/715348 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-lang/rust/rust-1.44.1.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.44.1.ebuild b/dev-lang/rust/rust-1.44.1.ebuild index bd67db4cdf4..1ba3a231d20 100644 --- a/dev-lang/rust/rust-1.44.1.ebuild +++ b/dev-lang/rust/rust-1.44.1.ebuild @@ -181,6 +181,11 @@ src_configure() { done if use wasm; then rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" + if use system-llvm; then + # un-hardcode rust-lld linker for this target + # https://bugs.gentoo.org/715348 + sed -i '/linker:/ s/rust-lld/wasm-ld/' src/librustc_target/spec/wasm32_base.rs || die + fi fi rust_targets="${rust_targets#,}" @@ -312,7 +317,7 @@ src_configure() { # ) # no extra hand holding is done, no target transformations, all # values are passed as-is with just basic checks, so it's up to user to supply correct values - # valid rust targets can be obtained with + # valid rust targets can be obtained with # rustc --print target-list # matching cross toolchain has to be installed # matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
