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 #1294

Merged
merged 1 commit into from
Apr 18, 2023

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Feb 20, 2023

This is needed for all platforms that don't have multi-architecture libraries like Darwin. Also, add the new architecture-specific rpath to the resulting swift-driver and make it possible to cross-compile this repo for non-Darwin platforms on Darwin.

The driver changes are the Swift translation of the Driver-specific changes of swiftlang/swift#63782.

Resolves apple swift#63645

This replaces all but one prior check of the host system instead, plus removed
unnecessary regex checking.

if cross_compile:
cross_compile_json = json.load(open(args.cross_compile_config))
command += ['-target', cross_compile_json["target"]]
target_info_json = subprocess.check_output(command,
Copy link
Member Author

Choose a reason for hiding this comment

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

@finagolfin
Copy link
Member Author

Updated this pull with build script changes to allow cross-compiling to Android on macOS: @artemcm, let me know what you think of the build script changes alone for now.

@finagolfin
Copy link
Member Author

@artemcm, 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.

…triple

This replaces all but one prior check of the host system instead, plus removed
unnecessary regex checking.
@finagolfin finagolfin changed the title [Unix] Move all ELF SDK runtime libraries into their own architecture-specific directories Support building this repo for more platforms, by checking the build triple Apr 12, 2023
@finagolfin
Copy link
Member Author

Removed the architecture-specific changes since the Swift devs want to take a different approach, leaving only these build script modifications I had also made.

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

@finagolfin
Copy link
Member Author

Ping @artemcm, this pull look okay to you?

@artemcm
Copy link
Contributor

artemcm commented Apr 18, 2023

@swift-ci test

@finagolfin
Copy link
Member Author

Passed all CI, ready for merge.

@artemcm artemcm merged commit 41257cd into swiftlang:main Apr 18, 2023
@finagolfin finagolfin deleted the multi-arch branch April 18, 2023 22:23
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