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.

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

Tell emscripten to remove exception handling code when panic=abort #39193

Merged
merged 3 commits into from
Feb 5, 2017
Merged

Tell emscripten to remove exception handling code when panic=abort #39193

merged 3 commits into from
Feb 5, 2017

Conversation

pepyakin
Copy link
Contributor

Fixes #36900

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@@ -712,6 +713,11 @@ fn link_natively(sess: &Session,
cmd.arg(root.join(obj));
}

if sess.target.target.options.is_like_emscripten &&
sess.panic_strategy() == PanicStrategy::Abort {
cmd.arg("-s DISABLE_EXCEPTION_CATCHING=1");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this'll want to get passed as two separate arguments, right? (right now this is just being passed as one)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, you are right. Will fix.

@alexcrichton
Copy link
Member

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned pnkfelix Jan 19, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 4, 2017

📌 Commit 24cb5b7 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 5, 2017
…xcrichton

Tell emscripten to remove exception handling code when panic=abort

Fixes rust-lang#36900
bors added a commit that referenced this pull request Feb 5, 2017
@bors bors merged commit 24cb5b7 into rust-lang:master Feb 5, 2017
@bors
Copy link
Contributor

bors commented Feb 5, 2017

⌛ Testing commit 24cb5b7 with merge 9c8cdb2...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants