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

Support building this repo for more platforms, by checking the build triple #500

Merged
merged 1 commit into from
May 23, 2023

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Mar 6, 2023

Summary

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.

Alex had asked for the regex removals in swiftlang/sourcekit-lsp#717, so I brought them over here too.

Dependencies

The linked compiler pull and the various other repo pulls tested there. None

Testing

Primarily, it should work as before, but I also added an rpath check to swiftlang/swift-integration-tests#113 so that it's checked on every linux CI run from now on.

Checklist

  • Added tests - externally, in the integration test
  • Ran the ./bin/test script and it succeeded
  • Updated documentation if necessary

I didn't run the test script because I don't have all the dependencies set up locally- the CI will check that- and there's no doc to update for build script changes AFAIK.

@finagolfin
Copy link
Member Author

@franklinsch, now that this passed the CI on the linked compiler pull, looking for review so I can get this in before the upcoming 5.9 branch. Please don't merge though, as all 11 pulls will have to be merged together.

@finagolfin
Copy link
Member Author

Removed the runpath change since the Swift devs want to take a different approach, leaving only these build script modifications I had come up with.

One last CI run and this can go in, @ethan-kusters.

@finagolfin finagolfin changed the title On ELF platforms, add a runpath to an architecture-specific directory for the runtime libraries. Support building this repo for more platforms, by checking the build triple Apr 12, 2023
@finagolfin
Copy link
Member Author

@QuietMisdreavus, would you run the CI and review?

@ethan-kusters
Copy link
Contributor

@swift-ci please test

@ethan-kusters
Copy link
Contributor

@buttaface is there a recent CI run in the Swift repo that links this change and successfully produces a toolchain? I'm seeing swiftlang/swift#63782 but since that was declined I'd rather see this successfully build with the main branch before merging here.

@finagolfin
Copy link
Member Author

Not with this specific pull, no, only the prior version that also changed the runpaths. You'll have to build this one again if you want to check that.

…triple

This is rather than checking the host system, plus removed unnecessary regex checking.
@finagolfin
Copy link
Member Author

@bnbarham, would you kick off a toolchain build of this pull on the main compiler repo, to assuage Ethan's concerns?

@finagolfin
Copy link
Member Author

@ethan-kusters, a full CI build of this pull passed now, should be okay to go in.

Copy link
Contributor

@ethan-kusters ethan-kusters left a comment

Choose a reason for hiding this comment

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


Looks great. Thank you @finagolfin!

@ethan-kusters
Copy link
Contributor

@swift-ci please test

@finagolfin
Copy link
Member Author

@ethan-kusters, please merge if okay.

@ethan-kusters ethan-kusters merged commit 05ea066 into swiftlang:main May 23, 2023
@finagolfin finagolfin deleted the arch branch May 24, 2023 03:59
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.

2 participants