averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update wasmkit toolchain build to emit universal on macOS to fix #82390

Browse Source 
[platform_args] has platform variants of SwiftPM wasmkit build command:
- unchanged: non-macOS + set_installation_rpath -> rpath config
- added: macOS -> universal binaries using --arch

side effect ok?: binary path changes are captured by '--show-bin-path'
This commit is contained in:
wti
2025-06-21 11:20:40 -07:00
parent 374026f344
commit 65302367d0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/swift_build_support/swift_build_support/products/wasmkit.py
View File

@@ -77,15 +77,18 @@ def run_swift_build(host_target, product, swiftpm_package_product_name, set_inst
# Building with the freshly-built SwiftPM # Building with the freshly-built SwiftPM
swift_build = os.path.join(product.install_toolchain_path(host_target), "bin", "swift-build") swift_build = os.path.join(product.install_toolchain_path(host_target), "bin", "swift-build")
build_os = host_target.split('-')[0] if host_target.startswith('macos'):
if set_installation_rpath and not host_target.startswith('macos'): # Universal binary on macOS
platform_args = ['--arch', 'x86_64', '--arch', 'arm64']
elif set_installation_rpath:
# Library rpath for swift, dispatch, Foundation, etc. when installing # Library rpath for swift, dispatch, Foundation, etc. when installing
rpath_args = [ build_os = host_target.split('-')[0]
platform_args = [
'--disable-local-rpath', '-Xswiftc', '-no-toolchain-stdlib-rpath', '--disable-local-rpath', '-Xswiftc', '-no-toolchain-stdlib-rpath',
'-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/' + build_os '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/' + build_os
] ]
else: else:
rpath_args = [] platform_args = []
build_args = [ build_args = [
swift_build, swift_build,
@@ -93,7 +96,7 @@ def run_swift_build(host_target, product, swiftpm_package_product_name, set_inst
'--package-path', os.path.join(product.source_dir), '--package-path', os.path.join(product.source_dir),
'--build-path', product.build_dir, '--build-path', product.build_dir,
'--configuration', 'release', '--configuration', 'release',
] + rpath_args ] + platform_args
if product.args.verbose_build: if product.args.verbose_build:
build_args.append('--verbose') build_args.append('--verbose')