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

Web: Fix version check for missing scalbnf LTO workaround #81869

Merged

Conversation

akien-mga
Copy link
Member

The check needs to happen after we set env["CXX"]. Follow-up to #81340.

The check needs to happen after we set `env["CXX"]`.
Follow-up to godotengine#81340.
@akien-mga akien-mga added bug platform:web topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Sep 18, 2023
@akien-mga akien-mga added this to the 4.2 milestone Sep 18, 2023
@akien-mga akien-mga requested a review from a team as a code owner September 18, 2023 14:33
@akien-mga akien-mga merged commit f0a9931 into godotengine:master Sep 19, 2023
@akien-mga akien-mga deleted the web-fix-lto-scalbnf-version-check branch September 19, 2023 07:13
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 20, 2023
@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Sep 24, 2023
@akien-mga
Copy link
Member Author

Cherry-picked for 3.5.3.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Sep 24, 2023
MarioLiebisch added a commit to MarioLiebisch/godot that referenced this pull request Sep 25, 2023
This fixes multiple issues/inconsistencies around  `get_compiler_version()`:
* With no shell allocated, launching the compiler could fail even
  with proper paths being set.
* The return value was described as "an array of version numbers as ints",
  but the function actually returned a `Dictionary` (or `None`).
* Not all calls were properly handling a `None` return value in case of errors.
  On Windows this broke compiling for me since godotengine#81869 with default settings.
* Some calls defined inconsistent defaults/fallbacks (`0` or `-1`).
mandryskowski pushed a commit to mandryskowski/godot that referenced this pull request Oct 11, 2023
This fixes multiple issues/inconsistencies around  `get_compiler_version()`:
* With no shell allocated, launching the compiler could fail even
  with proper paths being set.
* The return value was described as "an array of version numbers as ints",
  but the function actually returned a `Dictionary` (or `None`).
* Not all calls were properly handling a `None` return value in case of errors.
  On Windows this broke compiling for me since godotengine#81869 with default settings.
* Some calls defined inconsistent defaults/fallbacks (`0` or `-1`).
YuriSizov pushed a commit to YuriSizov/godot that referenced this pull request Oct 24, 2023
This fixes multiple issues/inconsistencies around  `get_compiler_version()`:
* With no shell allocated, launching the compiler could fail even
  with proper paths being set.
* The return value was described as "an array of version numbers as ints",
  but the function actually returned a `Dictionary` (or `None`).
* Not all calls were properly handling a `None` return value in case of errors.
  On Windows this broke compiling for me since godotengine#81869 with default settings.
* Some calls defined inconsistent defaults/fallbacks (`0` or `-1`).

(cherry picked from commit 426e18f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants