Skip to content

Commit

Permalink
Rollup merge of rust-lang#31985 - ashleysommer:libbackgrace_emscripte…
Browse files Browse the repository at this point in the history
…n_fix, r=alexcrichton

Was getting error:
```
running: "sh" "/home/flubba86/rust/src/libstd/../libbacktrace/configure" "--with-pic" "--disable-multilib" "--disable-shared" "--disable-host-shared" "--host=asmjs-unknown-emscripten" "--build=x86_64-unknown-linux-gnu"
...
Invalid configuration `asmjs-unknown-emscripten': system `emscripten' not recognized
```
This commit adds the emscripten target to the libbacktrace configure script so it is no longer unrecognized.
  • Loading branch information
Manishearth committed Mar 2, 2016
2 parents 4ed3826 + d846f49 commit 3f7867c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn main() {

let target = env::var("TARGET").unwrap();
let host = env::var("HOST").unwrap();
if !target.contains("apple") && !target.contains("msvc") {
if !target.contains("apple") && !target.contains("msvc") && !target.contains("emscripten"){
build_libbacktrace(&host, &target);
}

Expand Down

0 comments on commit 3f7867c

Please sign in to comment.