mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build any native compiler-builtin components for emscripten

Browse Source
This commit is contained in:
Brian Anderson 2016-09-28 16:08:59 +00:00
parent 4f5e73be1b
commit afa72b5dd6
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/sanity.rs
View File

@ -95,6 +95,13 @@ pub fn check(build: &mut Build) {
// We're gonna build some custom C code here and there, host triples // We're gonna build some custom C code here and there, host triples
// also build some C++ shims for LLVM so we need a C++ compiler. // also build some C++ shims for LLVM so we need a C++ compiler.
for target in build.config.target.iter() { for target in build.config.target.iter() {
// On emscripten we don't actually need the C compiler to just
// build the target artifacts, only for testing. For the sake
// of easier bot configuration, just skip detection.
if target.contains("emscripten") {
continue;
}
need_cmd(build.cc(target).as_ref()); need_cmd(build.cc(target).as_ref());
if let Some(ar) = build.ar(target) { if let Some(ar) = build.ar(target) {
need_cmd(ar.as_ref()); need_cmd(ar.as_ref());

6
src/libcompiler_builtins/build.rs
View File

@ -73,6 +73,12 @@ fn extend(&mut self, sources: &[&'static str]) {
fn main() { fn main() {
let target = env::var("TARGET").expect("TARGET was not set"); let target = env::var("TARGET").expect("TARGET was not set");
// Emscripten's runtime includes all the builtins
if target.contains("emscripten") {
return;
}
let cfg = &mut gcc::Config::new(); let cfg = &mut gcc::Config::new();
if target.contains("msvc") { if target.contains("msvc") {