Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a16dca3

Browse files
committedOct 17, 2019
Auto merge of #65251 - tlively:emscripten-upstream-upgrade, r=tlively
Upgrade Emscripten targets to use upstream LLVM backend - Compatible with Emscripten 1.38.46-upstream or later upstream. - Refactors the Emscripten target spec to share code with other wasm targets. - Replaces the old incorrect wasm32 C call ABI with the correct one, preserving the old one as wasm32_bindgen_compat for wasm-bindgen compatibility. - Updates the varargs ABI used by Emscripten and deletes the old one. - Removes the obsolete wasm32-experimental-emscripten target. - Uses EMCC_CFLAGS on CI to avoid the timeout problems with #63649. r? @alexcrichton
2 parents 7e49800 + c0aa7cb commit a16dca3

File tree

148 files changed

+438
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+438
-603
lines changed
 

‎config.toml.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@
377377
# but you can also optionally enable the "emscripten" backend for asm.js or
378378
# make this an empty array (but that probably won't get too far in the
379379
# bootstrap)
380+
# FIXME: remove the obsolete emscripten backend option.
380381
#codegen-backends = ["llvm"]
381382

382383
# This is the name of the directory in which codegen backends will get installed

‎src/bootstrap/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,7 @@ impl<'a> Builder<'a> {
980980
Some("-Wl,-rpath,@loader_path/../lib")
981981
} else if !target.contains("windows") &&
982982
!target.contains("wasm32") &&
983+
!target.contains("emscripten") &&
983984
!target.contains("fuchsia") {
984985
Some("-Wl,-rpath,$ORIGIN/../lib")
985986
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.