Skip to content

Commit

Permalink
Rollup merge of rust-lang#48093 - alexcrichton:dont-cross-emscripten,…
Browse files Browse the repository at this point in the history
… r=Mark-Simulacrum

Don't cross-compile Emscripten's LLVM

Eventually the LLVM version of Emscripten and the main LLVM will diverge, and we
can't cross-compile an older version of LLVM using a newer version of LLVM's
`llvm-config`.

This is extracted from rust-lang#47828
  • Loading branch information
kennytm committed Feb 9, 2018
2 parents 671206b + 866d13a commit e471747
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl Step for Llvm {
}

// http://llvm.org/docs/HowToCrossCompileLLVM.html
if target != build.build {
if target != build.build && !self.emscripten {
builder.ensure(Llvm {
target: build.build,
emscripten: false,
Expand Down

0 comments on commit e471747

Please sign in to comment.