]> git.lizzy.rs Git - rust.git/commitdiff
Fix compiling libstd with emscripten target.
authorashleysommer <flubba86@gmail.com>
Tue, 1 Mar 2016 10:57:43 +0000 (20:57 +1000)
committerAshley Sommer <Ashley.Sommer@csiro.au>
Wed, 2 Mar 2016 00:40:30 +0000 (10:40 +1000)
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.

src/libstd/build.rs

index 8fb49a1be4ea6add15f85bcf006551066b403938..a1144a964fd37ea6016cb2b24237cf3bfbe7891e 100644 (file)
@@ -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);
     }