diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-10-29 12:01:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 12:01:38 -0700 |
| commit | 8aa23125bb40f6949fcd2c4f48151c4d8a444419 (patch) | |
| tree | 9078d6ef80abe9bd3f999b901bb8da7d0d8fc620 /src/bootstrap | |
| parent | c4960c26027b6556aa5a63bc4a2c5697cf904e75 (diff) | |
| parent | 92c049be583a559430f17f3364c616fc92c059a1 (diff) | |
| download | rust-8aa23125bb40f6949fcd2c4f48151c4d8a444419.tar.gz rust-8aa23125bb40f6949fcd2c4f48151c4d8a444419.zip | |
Rollup merge of #65832 - tlively:emscripten-exception-handling, r=alexcrichton
Re-enable Emscripten's exception handling support Passes LLVM codegen and Emscripten link-time flags for exception handling if and only if the panic strategy is `unwind`. Sets the default panic strategy for Emscripten targets to `unwind`. Re-enables tests that depend on unwinding support for Emscripten, including `should_panic` tests. r? @alexcrichton
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 97cdd256801..e76604e45bd 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -534,6 +534,10 @@ impl Step for TestHelpers { builder.info("Building test helpers"); t!(fs::create_dir_all(&dst)); let mut cfg = cc::Build::new(); + // FIXME: Workaround for https://github.com/emscripten-core/emscripten/issues/9013 + if target.contains("emscripten") { + cfg.pic(false); + } // We may have found various cross-compilers a little differently due to our // extra configuration, so inform gcc of these compilers. Note, though, that |