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

emscripten: Assume version is at least 3.1.42 #4243

Merged
merged 2 commits into from
Feb 7, 2025

Conversation

kleisauke
Copy link
Contributor

This revises commit 63b0d67 to assume that Emscripten 3.1.42 or later is being used whenever emcc is not available. Since Emscripten 3.1.42 was released on June 23, 2023, the majority of users are expected to have upgraded to a more recent version.

Resolves: rust-lang/rust#131467.

@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2025

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

ci/emscripten.sh Outdated
Comment on lines 5 to 6
# Note: keep in sync with:
# https://github.com/rust-lang/rust/blob/master/src/ci/docker/scripts/emscripten.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there something else we should be referencing for version to test with? Maybe the platform docs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tgross35
Copy link
Contributor

The changes look fine to me, I think we might even be fine emitting a deprecation warning for old versions in build.rs so we can remove support. Keeping the old version around doesn't cost us anything though, so there is no urgency for that.

@hoodmane could you take a look at this as well?

@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Jan 27, 2025
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

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

LGTM but I'll wait for hoodmane to ack. CI is broken with the current nightly, I'll rerun once that is fixed.

Copy link
Contributor

@hoodmane hoodmane left a comment

Choose a reason for hiding this comment

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

Thanks @kleisauke

This revises commit 63b0d67
to assume that Emscripten 3.1.42 or later is being used whenever
`emcc` is not available. Since Emscripten 3.1.42 was released on
June 23, 2023, the majority of users are expected to have upgraded
to a more recent version.

Resolves: rust-lang/rust#131467.
@tgross35 tgross35 enabled auto-merge February 5, 2025 11:14
@tgross35 tgross35 added this pull request to the merge queue Feb 5, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 5, 2025
@tgross35 tgross35 added this pull request to the merge queue Feb 7, 2025
Merged via the queue into rust-lang:main with commit 970cbcb Feb 7, 2025
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-unix S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Emscripten metadata file size is wrong
4 participants