Skip to content

Commit 5752eae

Browse files
committed
Auto merge of #38598 - brson:em, r=alexcrichton
Emscripten targets are Unix targets I suspect this will fix the errors compiling libc https://buildbot.rust-lang.org/builders/auto-linux-rustbuild-cross-opt/builds/689/steps/compile/logs/stdio that are occurring on every PR. Emscripten is basically a posix emulation layer for the web and I consider it a Unix. cc @alexcrichton
2 parents 44ad63e + f262eea commit 5752eae

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/librustc_back/target/asmjs_unknown_emscripten.rs

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub fn target() -> Result<Target, String> {
2323
obj_is_bitcode: true,
2424
max_atomic_width: Some(32),
2525
post_link_args: vec!["-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()],
26+
target_family: Some("unix".to_string()),
2627
.. Default::default()
2728
};
2829
Ok(Target {

src/librustc_back/target/wasm32_unknown_emscripten.rs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pub fn target() -> Result<Target, String> {
2626
max_atomic_width: Some(32),
2727
post_link_args: vec!["-s".to_string(), "BINARYEN=1".to_string(),
2828
"-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()],
29+
target_family: Some("unix".to_string()),
2930
.. Default::default()
3031
};
3132
Ok(Target {

0 commit comments

Comments
 (0)