Revert "Windows: Configure with --enable-btls-lib to build BTLS dll"
#64
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
This reverts commit f63f4e2. This broke OSX ARM64 builds, and so we've been building official releases with this commit reverted locally for a while. See godotengine/build-containers#95 for details.
neikeq
reviewed
May 7, 2022
| @@ -88,8 +88,7 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl | |||
| '--enable-maintainer-mode', | |||
| '--with-tls=pthread', | |||
| '--without-ikvm-native', | |||
| '--enable-btls', | |||
| '--enable-btls-lib' | |||
There was a problem hiding this comment.
After reviewing all the changes, this seems to be the only part that has an effect on macOS builds. I think it's better to do this instead of reverting the entire thing.
So basically this line, then add this below:
if target_platform == 'windows':
CONFIGURE_FLAGS += [
'--enable-btls-lib'
]Or if we want to keep the change for Linux as well, then:
if target_platform != 'osx':
CONFIGURE_FLAGS += [
'--enable-btls-lib'
]There was a problem hiding this comment.
Well it turns out that this also breaks Windows builds, at least the MinGW ones: godotengine/godot#61176
So for now I've simply reverted both #47 and #65 to go back to the tried and trusted configuration that we've been using for the past few months.
|
Superseded by #65. |
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.
This reverts commit f63f4e2.
This broke OSX ARM64 builds, and so we've been building official releases
with this commit reverted locally for a while.
See godotengine/build-containers#95 for details.
As far as I remember this change was done in support of #47 to address godotengine/godot#54758 but that didn't really work out in the end?
Another option would be to improve the code further so that it affects only Windows and not macOS, but for now I PR the revert we've been using for several months (see godotengine/build-containers@d8d17c5).