This commit is contained in:
Brian Anderson 2016-09-08 01:58:00 +00:00
parent 10a52d507d
commit 37abec06e5
6 changed files with 8 additions and 6 deletions

View File

@ -975,7 +975,8 @@ impl Build {
// than an entry here.
let mut base = Vec::new();
if target != self.config.build && !target.contains("msvc") && !target.contains("emscripten") {
if target != self.config.build && !target.contains("msvc") &&
!target.contains("emscripten") {
base.push(format!("-Clinker={}", self.cc(target).display()));
}
return base

View File

@ -66,7 +66,8 @@ fn main() {
let host = env::var("HOST").expect("HOST was not set");
let is_crossed = target != host;
let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz", "jsbackend"];
let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz",
"jsbackend"];
// FIXME: surely we don't need all these components, right? Stuff like mcjit
// or interpreter the compiler itself never uses.

View File

@ -18,7 +18,7 @@
// system allocator. Do this by linking in jemalloc and making sure that we get
// an error.
// ignore-emscripten TODO: What "other allocator" should we use for emcc?
// ignore-emscripten FIXME: What "other allocator" should we use for emcc?
#![feature(alloc_jemalloc)]

View File

@ -16,7 +16,7 @@
// Ensure that rust dynamic libraries use jemalloc as their allocator, verifying
// by linking in the system allocator here and ensuring that we get a complaint.
// ignore-emscripten TODO: What "other allocator" is correct for emscripten?
// ignore-emscripten FIXME: What "other allocator" is correct for emscripten?
#![feature(alloc_system)]

View File

@ -12,7 +12,7 @@
// error-pattern:thread 'test_foo' panicked at
// compile-flags: --test
// ignore-pretty: does not work well with `--test`
// ignore-emscripten
// ignore-emscripten
#[test]
fn test_foo() {

View File

@ -12,7 +12,7 @@
// error-pattern:thread 'test_foo' panicked at
// compile-flags: --test
// ignore-pretty: does not work well with `--test`
// ignore-emscripten
// ignore-emscripten
#[test]
#[should_panic(expected = "foobar")]