about summary refs log tree commit diff
diff options
context:
space:
mode:
authorashleysommer <flubba86@gmail.com>2016-03-01 20:57:43 +1000
committerAshley Sommer <Ashley.Sommer@csiro.au>2016-03-02 10:40:30 +1000
commitd846f490a04df5899471218dfe904e7cfe42b13f (patch)
tree003a733cbb007b466c588a20dadd006ad214518c
parent84d8fec9b014975145eb0d9d6ec29216593e10f6 (diff)
downloadrust-d846f490a04df5899471218dfe904e7cfe42b13f.tar.gz
rust-d846f490a04df5899471218dfe904e7cfe42b13f.zip
Fix compiling libstd with emscripten target.
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
```

Undo change to libbacktrace configure script.
Modify libstd build.rs to not build libbacktrace in the case of targeting emscripten.
-rw-r--r--src/libstd/build.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index 8fb49a1be4e..a1144a964fd 100644
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -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);
     }