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

mbedTLS: Fix build without the module on MinGW #90691

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

Faless
Copy link
Collaborator

@Faless Faless commented Apr 15, 2024

The include/mbedtls/check_config.h header file has a generic check which requires MBEDTLS_PLATFORM_C to be defined on Windows when building with MinGW and ancient MSVC versions.

The few mbedTLS files we include in builds without the module don't really require anything from the mbedTLS platform file beside the mbedtls_platform_zeroize function which we already override with a custom one by defining MBEDTLS_PLATFORM_ZEROIZE_ALT.

So we simply add the same check and force the define in such case.

Fixes #90652

@Faless Faless added this to the 4.3 milestone Apr 15, 2024
@Faless Faless requested a review from a team as a code owner April 15, 2024 09:54
The `include/mbedtls/check_config.h` header file has a generic check
which requires `MBEDTLS_PLATFORM_C` to be defined on Windows when
building with MinGW and ancient MSVC versions.

The few mbedTLS files we include in builds without the module don't
really require anything from the mbedTLS platform file beside the
`mbedtls_platform_zeroize` function which we already override with a
custom one by defining `MBEDTLS_PLATFORM_ZEROIZE_ALT`.

So we simply add the same check and force the define in such case.
@Faless Faless force-pushed the fix/mbedtls_core_config_mingw branch from c88eecb to 060097b Compare April 15, 2024 14:06
@akien-mga akien-mga merged commit 4728ff3 into godotengine:master Apr 15, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Faless Faless deleted the fix/mbedtls_core_config_mingw branch April 15, 2024 17:19
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.

Can't cross-compile to Windows with module_mbedtls_enabled=no
2 participants