Skip to content

Only configure swift-reflection-dump if the host SDK is requested #2263

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
Apr 22, 2016
Merged

Only configure swift-reflection-dump if the host SDK is requested #2263

merged 1 commit into from
Apr 22, 2016

Conversation

bitjammer
Copy link
Contributor

Since swift-reflection-dump is a host-only tool, for iOS-only builds or
other builds where the host SDK isn't configured, the
swift-reflection-dump tool will fail to find libswiftReflection.

rdar://problem/25858390

@bitjammer
Copy link
Contributor Author

@gribozavr Does this change look sane to you?

@bitjammer
Copy link
Contributor Author

cc @egranata

@modocache
Copy link
Contributor

modocache commented Apr 21, 2016

Looks good to me, although I defer to @gribozavr's judgement.

One tiny nit-pick: other uses of is_sdk_requested in the codebase store the result in a lowercase variable like swift_build_tvos. I think the (loosely followed) convention is ALL_CAPS for variables that are meant to be global, lowercase otherwise.

@bitjammer
Copy link
Contributor Author

Yeah, I meant to make this a global since we'll probably use it elsewhere for these mixed tools, but it should probably move up in the file with a comment, now that you mention it.

@bitjammer
Copy link
Contributor Author

Actually, I think the check needs to be even more restrictive, I think it might need to be SWIFT_BUILD_TOOLS AND SWIFT_BUILD_STDLIB AND SWIFT_HOST_SDK_REQUESTED.

Since swift-reflection-dump is a host-only tool, for iOS-only builds or
other builds where the host SDK isn't configured and the standard
library isn't building, the swift-reflection-dump tool will fail to find
libswiftReflection.

rdar://problem/25858390
@gribozavr
Copy link
Contributor

LGTM with the more restrictive condition.

@bitjammer bitjammer assigned bitjammer and unassigned gribozavr Apr 21, 2016
@bitjammer
Copy link
Contributor Author

@swift-ci Please test

@bitjammer
Copy link
Contributor Author

Unrelated failure - merging.

@bitjammer bitjammer merged commit 5ac651d into swiftlang:master Apr 22, 2016
@bitjammer bitjammer deleted the swift-reflection-dump-host-builds branch April 22, 2016 07:45
MaxDesiatov added a commit that referenced this pull request Apr 19, 2021
Do not follow an existing symbolic link when overwriting
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