nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix emscripten linker invocation

Browse Source
This commit is contained in:
bjorn3 2022-05-06 17:20:42 +02:00
parent 606848a61e
commit 5cc3593c17
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock
View File

@ -3686,6 +3686,7 @@ dependencies = [
"rustc_span",
"rustc_symbol_mangling",
"rustc_target",
"serde_json",
"smallvec",
"snap",
"tempfile",

1
compiler/rustc_codegen_ssa/Cargo.toml
View File

@ -16,6 +16,7 @@ jobserver = "0.1.22"
tempfile = "3.2"
thorin-dwp = "0.2"
pathdiff = "0.2.0"
serde_json = "1.0.59"
snap = "1"
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
regex = "1.4"

19
compiler/rustc_codegen_ssa/src/back/linker.rs
View File

@ -1146,24 +1146,17 @@ impl<'a> Linker for EmLinker<'a> {
}
fn export_symbols(&mut self, _tmpdir: &Path, _crate_type: CrateType, symbols: &[String]) {
use std::fmt::Write;
debug!("EXPORTED SYMBOLS:");
let mut encoded = "[".to_string();
let mut symbols = symbols.iter();
if let Some(first_symbol) = symbols.next() {
write!(encoded, "{:?}", first_symbol).unwrap();
}
for symbol in symbols {
write!(encoded, ",{:?}", symbol).unwrap();
}
encoded.push(']');
debug!("{}", encoded);
self.cmd.arg("-s");
let mut arg = OsString::from("EXPORTED_FUNCTIONS=");
let encoded = serde_json::to_string(
&symbols.iter().map(|sym| "_".to_owned() + sym).collect::<Vec<_>>(),
)
.unwrap();
debug!("{}", encoded);
arg.push(encoded);
self.cmd.arg(arg);