Tweak wasm_base target spec to indicate linker is not GNU and update linker inferring logic for wasm-ld.

2021-06-01 17:13:10 -07:00
parent 625d5a693e
commit f667aca127
3 changed files with 8 additions and 3 deletions
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1005,6 +1005,8 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
                    || stem.ends_with("-clang")
                {
                    LinkerFlavor::Gcc
+                } else if stem == "wasm-ld" || stem.ends_with("-wasm-ld") {
+                    LinkerFlavor::Lld(LldFlavor::Wasm)
                } else if stem == "ld" || stem == "ld.lld" || stem.ends_with("-ld") {
                    LinkerFlavor::Ld
                } else if stem == "link" || stem == "lld-link" {