diff options
| author | bors <bors@rust-lang.org> | 2016-12-26 00:47:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-26 00:47:50 +0000 |
| commit | 5752eae5f5ce3517d36f6668619dd2c70e6d2d88 (patch) | |
| tree | 3f0d9eb55883d56d3fe6067fdcb1c5f5d95843f5 | |
| parent | 44ad63e4878fc913924f32248b6234d10d208d78 (diff) | |
| parent | f262eea2ee0108586d53d6181f813b288de50209 (diff) | |
| download | rust-5752eae5f5ce3517d36f6668619dd2c70e6d2d88.tar.gz rust-5752eae5f5ce3517d36f6668619dd2c70e6d2d88.zip | |
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
| -rw-r--r-- | src/librustc_back/target/asmjs_unknown_emscripten.rs | 1 | ||||
| -rw-r--r-- | src/librustc_back/target/wasm32_unknown_emscripten.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_back/target/asmjs_unknown_emscripten.rs b/src/librustc_back/target/asmjs_unknown_emscripten.rs index d86a9b09327..98a9e343d00 100644 --- a/src/librustc_back/target/asmjs_unknown_emscripten.rs +++ b/src/librustc_back/target/asmjs_unknown_emscripten.rs @@ -23,6 +23,7 @@ pub fn target() -> Result<Target, String> { obj_is_bitcode: true, max_atomic_width: Some(32), post_link_args: vec!["-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()], + target_family: Some("unix".to_string()), .. Default::default() }; Ok(Target { diff --git a/src/librustc_back/target/wasm32_unknown_emscripten.rs b/src/librustc_back/target/wasm32_unknown_emscripten.rs index 77ab4fcae70..fec269074da 100644 --- a/src/librustc_back/target/wasm32_unknown_emscripten.rs +++ b/src/librustc_back/target/wasm32_unknown_emscripten.rs @@ -26,6 +26,7 @@ pub fn target() -> Result<Target, String> { max_atomic_width: Some(32), post_link_args: vec!["-s".to_string(), "BINARYEN=1".to_string(), "-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()], + target_family: Some("unix".to_string()), .. Default::default() }; Ok(Target { |