Skip to content

Add PNaCl target info to the makefile target cfgs and initialize the PNaCl target machine if available. #30401

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

Merged
merged 1 commit into from
Dec 19, 2015

Conversation

DiamondLovesYou
Copy link
Contributor

// PNaCl doesn't provide some of the optional target components, so we
// manually initialize it here.
#[cfg(have_component_pnacl)]
fn init() {
Copy link
Member

Choose a reason for hiding this comment

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

Could this be init_pnacl b/c it's pnacl specific?

@alexcrichton
Copy link
Member

just one small nit but otherwise r=me

@DiamondLovesYou
Copy link
Contributor Author

Done.

@alexcrichton
Copy link
Member

@bors: r+ aa9e66eccffaf9077b1ecaaad9406d1bd43a9a4b

@bors
Copy link
Collaborator

bors commented Dec 19, 2015

⌛ Testing commit aa9e66e with merge c5f73c5...

@bors
Copy link
Collaborator

bors commented Dec 19, 2015

💔 Test failed - auto-win-msvc-64-opt

@DiamondLovesYou
Copy link
Contributor Author

Fixed.

@alexcrichton
Copy link
Member

@bors: r+ 0442be8

@bors
Copy link
Collaborator

bors commented Dec 19, 2015

⌛ Testing commit 0442be8 with merge cef0d0f...

@bors bors merged commit 0442be8 into rust-lang:master Dec 19, 2015
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.

3 participants