Skip to content

Utilities: update build-script-helper.py #1281

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.

Sign up for GitHub

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
Jan 31, 2023
Merged

Utilities: update build-script-helper.py #1281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Utilities/build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def install_swiftdriver(args, build_dir, prefix, targets) :

# Binary Swift Modules:
# swift-driver: SwiftDriver.swiftmodule, SwiftOptions.swiftmodule
# swift-tools-support-core: TSCUtility.swiftmodule, TSCLibc.swiftmodule, TSCBasic.swiftmodule
# swift-tools-support-core: TSCUtility.swiftmodule, TSCBasic.swiftmodule
# swift-argument-parser: ArgumentParser.swiftmodule (disabled until needed)
# swift-system: SystemPackage.swiftmodule
install_binary_swift_modules(args, build_dir, install_lib, targets)
Expand Down Expand Up @@ -303,7 +303,7 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar

# Fixup the TSC and llbuild rpaths
driver_libs = [os.path.join('lib', d) for d in ['libSwiftDriver', 'libSwiftOptions', 'libSwiftDriverExecution']]
tsc_libs = [os.path.join('dependencies', 'swift-tools-support-core', 'lib', d) for d in ['libTSCBasic', 'libTSCLibc', 'libTSCUtility']]
tsc_libs = [os.path.join('dependencies', 'swift-tools-support-core', 'lib', d) for d in ['libTSCBasic', 'libTSCUtility']]
for lib in driver_libs + tsc_libs:
for target in targets:
lib_path = os.path.join(build_dir, target,
Expand All @@ -323,7 +323,7 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar

# Install the swift-tools-support core shared libraries into the toolchain lib
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-tools-support-core')
for lib in ['libTSCBasic', 'libTSCLibc', 'libTSCUtility']:
for lib in ['libTSCBasic', 'libTSCUtility']:
install_library(args, build_dir, package_subpath, lib, shared_lib_ext,
universal_lib_dir, toolchain_lib_dir, 'swift-tools-support-core', targets)

Expand Down Expand Up @@ -371,7 +371,7 @@ def install_binary_swift_modules(args, build_dir, toolchain_lib_dir, targets):
# swift-tools-support-core
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-tools-support-core',
product_subpath)
for module in ['TSCUtility', 'TSCLibc', 'TSCBasic']:
for module in ['TSCUtility', 'TSCBasic']:
install_module(args, build_dir, package_subpath, toolchain_lib_dir, module, targets)

# swift-argument-parser
Expand Down