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

Set Swift clang-linker path #8748

Merged

Conversation

etcwilde
Copy link
Member

@etcwilde etcwilde commented May 13, 2024

The swift driver is picking up the system clang instead of using the clang set in CC. The system clang is attempting to use bfd to link Swift, which doesn't work due to Swift's protected symbol usage.

rdar://123061492
rdar://127628654

@etcwilde
Copy link
Member Author

@swift-ci please test

@etcwilde etcwilde force-pushed the ewilde/set-swift-clang-linker branch 2 times, most recently from fa8dce4 to 4f4af8f Compare May 14, 2024 00:47
@etcwilde
Copy link
Member Author

@swift-ci please test

@etcwilde etcwilde marked this pull request as ready for review May 14, 2024 16:26
@adrian-prantl
Copy link
Member

Can you rebase this PR on swift/release/6.0, which automerges to stable/20230725, and then cherry-pick -x to next

@etcwilde etcwilde force-pushed the ewilde/set-swift-clang-linker branch from 4f4af8f to 1f6bd55 Compare May 14, 2024 22:48
@etcwilde etcwilde changed the base branch from stable/20230725 to swift/release/6.0 May 14, 2024 22:49
@etcwilde
Copy link
Member Author

Can you rebase this PR on swift/release/6.0, which automerges to stable/20230725, and then cherry-pick -x to next

Done, and here's the cherry-pick:
#8759

@etcwilde
Copy link
Member Author

@swift-ci please test

@etcwilde
Copy link
Member Author

@swift-ci please test macOS platform

@etcwilde etcwilde force-pushed the ewilde/set-swift-clang-linker branch 3 times, most recently from 577dd53 to fb64ef9 Compare May 15, 2024 22:40
The swift driver is picking up the system clang instead of using the
clang set in `CC`. The system clang is attempting to use bfd to link
Swift, which doesn't work due to Swift's protected symbol usage.
Set the swift-driver tool directory based on the location of the clang
in use to ensure that we're picking up a consistent set of tools across
all of the tests.
@etcwilde etcwilde force-pushed the ewilde/set-swift-clang-linker branch from fb64ef9 to 2c8a5e6 Compare May 16, 2024 22:29
@etcwilde
Copy link
Member Author

@swift-ci please test

Copy link
Member

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

Much cleaner!

@adrian-prantl
Copy link
Member

Don't forget to cherry-pick -x this to next afterwards.

@etcwilde
Copy link
Member Author

@swift-ci please test

@shahmishal shahmishal merged commit 0a6c83e into apple:swift/release/6.0 May 20, 2024
3 checks passed
@etcwilde
Copy link
Member Author

Don't forget to cherry-pick -x this to next afterwards.

Cherry-pick PR: #8759

@etcwilde etcwilde deleted the ewilde/set-swift-clang-linker branch May 24, 2024 05:49
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.

None yet

4 participants