Skip to content

[cmake] Allow overriding Clang resource symlink target #41301

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 9, 2022

Conversation

drodriguez
Copy link
Contributor

When building with a prebuilt Clang, the changes introduced in #40707
supposed that the toolchain was in its final path.

When building in stages (first the toolchain, then the standard
library), the toolchain might not be in the final path, and the created
symlink will point to a machine-local path that does not make sense.

The changes introduced should not modify the existing behaviour
introduced by #40707, but should allow customizing the final
installation target using the CMake cached variable for those setups
that need the flexibility.

/cc @buttaface

When building with a prebuilt Clang, the changes introduced in swiftlang#40707
supposed that the toolchain was in its final path.

When building in stages (first the toolchain, then the standard
library), the toolchain might not be in the final path, and the created
symlink will point to a machine-local path that does not make sense.

The changes introduced should not modify the existing behaviour
introduced by swiftlang#40707, but should allow customizing the final
installation target using the CMake cached variable for those setups
that need the flexibility.
@drodriguez drodriguez requested a review from etcwilde February 9, 2022 20:26
@drodriguez
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Member

@finagolfin finagolfin left a comment

Choose a reason for hiding this comment

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

Obviously my pull wouldn't work for the scenario you describe, just like the previous configuration didn't handle it, but I figured that would take later modification, as in the instructions for my Android SDKs. This pull seems a good way to configure that when building instead, for the cases when you know the final deployment path.

Copy link
Member

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

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

Yeah, this is better.

@drodriguez drodriguez merged commit c6c88ce into swiftlang:main Feb 9, 2022
@drodriguez drodriguez deleted the clang-headers-install-target branch February 9, 2022 22:37
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