rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #98355 - hoodmane:emscripten-no-default, r=petrochenkov

Browse Source 
Update no_default_libraries handling for emscripten target

```@sbc100``` says:

> `-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[]` is almost certainly wrong/out-of-date.   This setting defaults to the empty list anyway these days so its redundant.  Also we now support `-nodefaultlibs` so you can use that, as with other toolchains.

https://github.com/rust-lang/rust/issues/98303#issuecomment-1162163684
This commit is contained in:
Michael Goulet
2022-06-23 14:39:12 -07:00
committed by GitHub
parent 21085e9120 b96ae9b204
commit cc45ad50f8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,7 +1140,7 @@ impl<'a> Linker for EmLinker<'a> {
fn no_crt_objects(&mut self) {} fn no_crt_objects(&mut self) {}
fn no_default_libraries(&mut self) { fn no_default_libraries(&mut self) {
self.cmd.args(&["-s", "DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[]"]); self.cmd.arg("-nodefaultlibs");
} }
fn export_symbols(&mut self, _tmpdir: &Path, _crate_type: CrateType, symbols: &[String]) { fn export_symbols(&mut self, _tmpdir: &Path, _crate_type: CrateType, symbols: &[String]) {

1
compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
View File

@@ -28,6 +28,7 @@ pub fn target() -> Target {
linker: None, linker: None,
is_like_emscripten: true, is_like_emscripten: true,
panic_strategy: PanicStrategy::Unwind, panic_strategy: PanicStrategy::Unwind,
no_default_libraries: false,
post_link_args, post_link_args,
families: cvs!["unix", "wasm"], families: cvs!["unix", "wasm"],
..options ..options