Skip to content

Use lib crate type for SGX in fn build_auxiliary#71456

Merged
bors merged 1 commit intorust-lang:masterfrom
mzohreva:mz/sgx-no-dylib
Apr 28, 2020
Merged

Use lib crate type for SGX in fn build_auxiliary#71456
bors merged 1 commit intorust-lang:masterfrom
mzohreva:mz/sgx-no-dylib

Conversation

@mzohreva
Copy link
Contributor

@mzohreva mzohreva commented Apr 23, 2020

since SGX does not support dylib

cc @Goirad

@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 23, 2020

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2020
@Goirad
Copy link
Contributor

Goirad commented Apr 23, 2020

This looks good to me

@mzohreva
Copy link
Contributor Author

mzohreva commented Apr 23, 2020

cc @jethrogb

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Apr 28, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 28, 2020

📌 Commit 7f13723 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 28, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 28, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2020
@bors
Auto merge of rust-lang#71644 - Dylan-DPC:rollup-cq7plwa, r=Dylan-DPC
db98d32 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71340 (Moving more build-pass tests to check-pass)
 - rust-lang#71456 (Use lib crate type for SGX in `fn build_auxiliary`)
 - rust-lang#71615 (share some common code for compile-time miri instances)
 - rust-lang#71637 (Minor formatting changes in `cfg-sanitize.md`)
 - rust-lang#71641 (Update books)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Apr 28, 2020

☔ The latest upstream changes (presumably #71644) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 28, 2020
@bors bors merged commit 45edd23 into rust-lang:master Apr 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakis nikomatsakis

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mzohreva @rust-highfive @Goirad @nikomatsakis @bors