Skip to content

runtime: tweak the environment handling #79216

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Feb 7, 2025

We would previously enable "environment variables" on Android via global properties. Re-order the macros a bit to make it more explicit that the environment handling is required for that and remove it when environment variables are unsupported.

We would previously enable "environment variables" on Android via global
properties. Re-order the macros a bit to make it more explicit that the
environment handling is required for that and remove it when environment
variables are unsupported.
@compnerd
Copy link
Member Author

compnerd commented Feb 7, 2025

CC: @andrurogerz

@compnerd
Copy link
Member Author

compnerd commented Feb 7, 2025

@swift-ci please smoke test

@andrurogerz
Copy link
Contributor

I think this change should be fine. We don't need to call platformInitialize when SWIFT_STDLIB_HAS_ENVIRON is not defined. This should not be the case on Android, which is the only place platformInitialize is meaningful. Thank you for fixing.

I would approve this PR if I could :)

@compnerd
Copy link
Member Author

compnerd commented Feb 7, 2025

@swift-ci please test Windows platform

@compnerd compnerd merged commit e2cb835 into swiftlang:main Feb 10, 2025
3 checks passed
@compnerd compnerd deleted the android-env branch February 10, 2025 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants