diff options
| author | Ingvar Stepanyan <me@rreverser.com> | 2017-02-09 13:35:31 +0000 |
|---|---|---|
| committer | Ingvar Stepanyan <me@rreverser.com> | 2017-02-10 17:31:04 +0000 |
| commit | 84c2a6716058db8d40a549f8349f7473f7b09e82 (patch) | |
| tree | 48c4150e83825e018603a7b2985874b9025d3a2b | |
| parent | eed6168a3ba300c7166a8072347505fc6164c8bf (diff) | |
| download | rust-84c2a6716058db8d40a549f8349f7473f7b09e82.tar.gz rust-84c2a6716058db8d40a549f8349f7473f7b09e82.zip | |
Reenable exception catching in Emscripten even on optimized targets
| -rw-r--r-- | src/librustc_trans/back/link.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index c5f6792a45f..1da9fcb0e95 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -722,9 +722,13 @@ fn link_natively(sess: &Session, cmd.arg(root.join(obj)); } - if sess.target.target.options.is_like_emscripten && - sess.panic_strategy() == PanicStrategy::Abort { - cmd.args(&["-s", "DISABLE_EXCEPTION_CATCHING=1"]); + if sess.target.target.options.is_like_emscripten { + cmd.arg("-s"); + cmd.arg(if sess.panic_strategy() == PanicStrategy::Abort { + "DISABLE_EXCEPTION_CATCHING=1" + } else { + "DISABLE_EXCEPTION_CATCHING=0" + }); } { |