Skip to content

Symlink swift-autolink-extract into the SPM build dir #2871

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
Aug 19, 2020

Conversation

owenv
Copy link
Contributor

@owenv owenv commented Aug 15, 2020

When using the integrated swift-driver, SPM may need to look up swift-autolink-extract. Symlinking it into the build dir alongside swift and swiftc prevents some test failures caused by swiftlang/swift-driver#208 (which fixes generation of autolink-extract jobs on linux)

@owenv owenv marked this pull request as draft August 15, 2020 02:35
@owenv
Copy link
Contributor Author

owenv commented Aug 15, 2020

@owenv
Copy link
Contributor Author

owenv commented Aug 15, 2020

@owenv owenv changed the title [DNM] PR to test swift-driver changes Symlink swift-autolink-extract into the SPM build dir Aug 15, 2020
@owenv
Copy link
Contributor Author

owenv commented Aug 15, 2020

swiftlang/swift-driver#208
@swift-ci smoke test

@owenv owenv marked this pull request as ready for review August 16, 2020 00:11
@owenv
Copy link
Contributor Author

owenv commented Aug 16, 2020

cc @DougGregor & @artemcm

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

Yeah, makes sense. Should we symlink swift-frontend for good measure?

@tomerd
Copy link
Contributor

tomerd commented Aug 17, 2020

@DougGregor lgtm merge when ready

@owenv
Copy link
Contributor Author

owenv commented Aug 18, 2020

@DougGregor right now the bootstrap script only accepts --swiftc-path, which is why I'm not symlinking swift-frontend in this pr. I think we should be able to modify build-script to pass the toolchain bin/ path instead, but I haven't looked into it yet.

@DougGregor
Copy link
Member

Okay! Let's go ahead and merge this

@owenv
Copy link
Contributor Author

owenv commented Aug 19, 2020

@DougGregor do you mind merging this on my behalf? I don't have write access to this repo

@DougGregor DougGregor merged commit 5b942d6 into swiftlang:master Aug 19, 2020
@DougGregor
Copy link
Member

Sure, thanks!

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