Skip to content

Add SWIFT_PLATFORMS_USING_ISYSROOT to list platforms that should be building with -isysroot #33469

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 2 commits into from
Aug 14, 2020

Conversation

kubamracek
Copy link
Contributor

No description provided.

@kubamracek kubamracek requested a review from compnerd August 13, 2020 22:24
@compnerd
Copy link
Member

Hmm, I'm not sure I understand this. If I'm working with freestanding, I could be on a Linux or windows environment, which don't use isysroot. I realize that those configurations aren't in CI currently, but this configuration makes that more challenging. Maybe we should have a prefer isysroot option instead that's false and true on Darwin hosts by default but the user can change?

@kubamracek
Copy link
Contributor Author

You're right. (this is not a well-thought-out PR, I just wanted to see your take on this.) We should make the freestanding config be usable from any environment. My immediate problem is when building freestanding on a macOS host, I need to use -isysroot (that's what all Apple SDKs expect). Let me try adding this as an option into the SDK configuration itself.

@kubamracek
Copy link
Contributor Author

@compnerd Updated. Notice that currently the FREESTANDING SDK is set up as configure_sdk_darwin, so it does get USE_ISYSROOT=1. If we wanted to actually start building FREESTANDING on Linux, we'd have to add a configure_sdk_unix somewhere.

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 046a174

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 046a174

@@ -145,6 +145,8 @@ endfunction()
# SWIFT_SDK_${prefix}_LIB_SUBDIR Library subdir for this SDK
# SWIFT_SDK_${prefix}_VERSION_MIN_NAME Version min name for this SDK
# SWIFT_SDK_${prefix}_TRIPLE_NAME Triple name for this SDK
# SWIFT_SDK_${prefix}_OBJECT_FORMAT The object file format (e.g. MACHO)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah! I think you put this in the wrong commit 🤷‍♂️

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this was an intentional drive-by addition :) It seemed to be missing...

@kubamracek kubamracek merged commit f91fe9c into swiftlang:master Aug 14, 2020
@kubamracek kubamracek deleted the isysroot-freestanding branch August 14, 2020 21:33
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