Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Emscripten-specific linker #39490

Merged
merged 3 commits into from
Feb 11, 2017
+168 −6
Merged

Add Emscripten-specific linker #39490

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed6168
Add Emscripten-specific linker
RReverser Feb 3, 2017
84c2a67
Reenable exception catching in Emscripten even on optimized targets
RReverser Feb 9, 2017
f35b598
Disable memory init file until further notice
RReverser Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reenable exception catching in Emscripten even on optimized targets
  • Loading branch information
@RReverser
RReverser committed Feb 10, 2017
commit 84c2a6716058db8d40a549f8349f7473f7b09e82
10 changes: 7 additions & 3 deletions src/librustc_trans/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
});
}

{
Expand Down