Web: Workaround Emscripten 3.1.42+ LTO regression #81340
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akien-mga
added
bug
platform:web
topic:buildsystem
cherrypick:3.x
akien-mga
commented
Sep 5, 2023
| @@ -16,7 +16,7 @@ concurrency: | |||
|
|
|||
| jobs: | |||
| web-template: | |||
| runs-on: "ubuntu-20.04" | |||
| runs-on: "ubuntu-22.04" | |||
There was a problem hiding this comment.
This isn't strictly needed, just a drive-by change as Ubuntu 20.04 will be EOL'ed by GH Actions eventually, and we have no reason to stick to the old version for Web builds.
akien-mga
commented
Sep 5, 2023
Comment on lines
+122
to
+124
| cc_version = get_compiler_version(env) | ||
| cc_semver = (int(cc_version["major"]), int(cc_version["minor"]), int(cc_version["patch"])) | ||
| if cc_semver >= (3, 1, 42): |
There was a problem hiding this comment.
I'll refactor this logic in #80719 after this is merged.
There was a problem hiding this comment.
Just noticed in the 3.x branch that we use tuple(get_compiler_version(env)) there, which is nicer. I'm changing it to that when cherry-picking, and for master I'll refactor later.
Edit: That can't be done for 4.x, there's more than just (major, minor, patch) in the dict.
YuriSizov
approved these changes
Sep 5, 2023
|
Cherry-picked for 3.6. |
akien-mga
removed
the
cherrypick:3.x
|
Cherry-picked for 3.5.3. |
akien-mga
removed
the
cherrypick:3.5
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Sep 18, 2023
The check needs to happen after we set `env["CXX"]`. Follow-up to godotengine#81340.
|
Cherry-picked for 4.1.2. |
YuriSizov
removed
the
cherrypick:4.1
YuriSizov
pushed a commit
to YuriSizov/godot
that referenced
this pull request
Sep 20, 2023
The check needs to happen after we set `env["CXX"]`. Follow-up to godotengine#81340. (cherry picked from commit 5016180)
mandryskowski
pushed a commit
to mandryskowski/godot
that referenced
this pull request
Oct 11, 2023
The check needs to happen after we set `env["CXX"]`. Follow-up to godotengine#81340.
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Oct 30, 2023
The check needs to happen after we set `env["CXX"]`. Follow-up to godotengine#81340. (cherry picked from commit 5016180)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #80010.
Tested with Emscripten 3.1.45 and
scons p=web target=template_release production=yes verbose=yes.