Skip to content

[build-script] Remove hard-coded install prefix of /usr and pass it in instead #257

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 20, 2020

Conversation

finagolfin
Copy link
Member

Because of a bug upstream in the main build-script, the install prefix set by the user wasn't being passed in to this repo on non-Darwin platforms and these files assumed it to be /usr. This pull removes that assumption and has the main build-script pass an install prefix appended to the toolchain path instead, swiftlang/swift#30565.

Let me know if this will require changing the name of SOURCEKIT_TOOLCHAIN_PATH.

@benlangmuir
Copy link
Contributor

swiftlang/swift#30565
@swift-ci please test

@finagolfin
Copy link
Member Author

I think you'll need to test with both the main build-script pull and the indexstore-db pull?

Looks like this is the one repo that checked both appending /bin and /usr/bin to the toolchain path passed in, rather than simply assuming and appending /usr like all the other Swift repos I patched, so maybe no changes for SOURCEKIT_TOOLCHAIN_PATH are required?

@benlangmuir
Copy link
Contributor

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