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

Use build script to detect wasm #4865

Merged
merged 6 commits into from Jul 26, 2022
Merged

Use build script to detect wasm #4865

merged 6 commits into from Jul 26, 2022

Conversation

Darksonn
Copy link
Contributor

This PR reverts #4864 (see comments on PR) and uses a different strategy for wasm detection.

@Darksonn Darksonn added A-tokio Area: The main tokio crate T-wasm Topic: Web Assembly labels Jul 26, 2022
@Darksonn Darksonn requested a review from taiki-e July 26, 2022 10:06
@github-actions github-actions bot added the R-loom Run loom tests on this PR label Jul 26, 2022
@Darksonn
Copy link
Contributor Author

The interesting parts of the change are in:

  • tokio/build.rs
  • tokio/Cargo.toml
  • tokio/src/lib.rs

@Darksonn Darksonn changed the title Alice/cfg wasm Use build script to detect wasm Jul 26, 2022
@Darksonn Darksonn removed the R-loom Run loom tests on this PR label Jul 26, 2022
@github-actions github-actions bot added the R-loom Run loom tests on this PR label Jul 26, 2022
taiki-e
taiki-e reviewed Jul 26, 2022
View reviewed changes
Copy link
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

LGTM

tokio/build.rs Show resolved Hide resolved
@Darksonn @taiki-e
Add comment to build.rs
38b1c69 
Co-authored-by: Taiki Endo <te316e89@gmail.com>
@Darksonn Darksonn mentioned this pull request Jul 26, 2022
Open
6 tasks
@Darksonn Darksonn enabled auto-merge (squash) July 26, 2022 11:04
@Darksonn Darksonn merged commit b2ada60 into master Jul 26, 2022
@Darksonn Darksonn deleted the alice/cfg-wasm branch July 26, 2022 11:26
@taiki-e
Copy link
Member

taiki-e commented Jul 26, 2022

Hmm, looks like the auto-merge merged the PR before the loom CI was completed

auto-merge

@Darksonn
Copy link
Contributor Author

Ugh. Auto-merge doing this is kind of annoying.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taiki-e taiki-e taiki-e approved these changes

Assignees
No one assigned
Labels
A-tokio Area: The main tokio crate R-loom Run loom tests on this PR T-wasm Topic: Web Assembly
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Darksonn @taiki-e