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

Check the target triple to determine what build flags to apply when building sourcekit-lsp #717

Merged
merged 1 commit into from
Apr 20, 2023

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Feb 23, 2023

This is needed for swiftlang/swift#63782, which changes the Unix toolchain to look for libraries in architecture-specific directories.

I also updated some checks for the runtime target triple, rather than checking the host system, and removed unnecessary regex checking.

Utilities/build-script-helper.py Show resolved Hide resolved
Utilities/build-script-helper.py Outdated Show resolved Hide resolved
Utilities/build-script-helper.py Outdated Show resolved Hide resolved
@finagolfin
Copy link
Member Author

Made the changes you asked for but don't merge yet, just looking for review until this can be tested on the CI alongside the other pulls.

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks

@ahoppen
Copy link
Member

ahoppen commented Feb 27, 2023

Let me know when you’d like to run tests for this PR and merge it.

@finagolfin
Copy link
Member Author

@ahoppen, I've been asking for someone to run all these pulls together on the CI, see comment on linked compiler pull, would be great if you would kick that CI run off.

@ahoppen
Copy link
Member

ahoppen commented Feb 27, 2023

I triggered PR testing on the main PR. Ping me if you need more testing.

@finagolfin
Copy link
Member Author

Thanks, looks like I missed installing the local libicu for linux in this new location, will investigate.

@finagolfin
Copy link
Member Author

@ahoppen, fixed the two issues that cropped up on the CI, ready for another CI run on the linked compiler pull with all 7 of these other pulls.

…uilding sourcekit-lsp

I also replaced unnecessary regex checks.
@finagolfin
Copy link
Member Author

Removed the runpath changes since the Swift devs want to take a different approach, leaving only the build script updates we discussed.

One last CI run and this can go in, @ahoppen.

@finagolfin finagolfin changed the title On ELF platforms, add a runpath to an architecture-specific directory for the runtime libraries. Check the target triple to determine what build flags to apply when building sourcekit-lsp Apr 12, 2023
@finagolfin
Copy link
Member Author

Ping @ahoppen, something wrong with getting this in?

@finagolfin
Copy link
Member Author

Ping @benlangmuir, Alex appears to be busy lately, would you run through CI and merge?

@benlangmuir
Copy link
Contributor

@swift-ci please test

@ahoppen
Copy link
Member

ahoppen commented Apr 20, 2023

Sorry, I just forgot about it and was indeed busy the last two days. Merging it now.

@ahoppen ahoppen merged commit af6309e into swiftlang:main Apr 20, 2023
@finagolfin finagolfin deleted the arch branch April 20, 2023 07:27
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