Skip to content

[Build Script Helper] install llbuild and ArgumentParser #328

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
Oct 23, 2020
Merged

[Build Script Helper] install llbuild and ArgumentParser #328

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions Utilities/build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,14 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir):
install_library(args, build_dir, package_subpath, lib,
universal_lib_dir, toolchain_lib_dir, 'swift-tools-support-core')

# TODO: Until the argument parser is used, avoid installing it into the toolchain here
#package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser')
#install_library(args, build_dir, package_subpath, 'libArgumentParser',
# universal_lib_dir, toolchain_lib_dir,'swift-argument-parser')
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser')
install_library(args, build_dir, package_subpath, 'libArgumentParser',
universal_lib_dir, toolchain_lib_dir,'swift-argument-parser')

package_subpath = os.path.join(args.configuration, 'dependencies', 'llbuild')
for lib in ['libllbuildSwift', 'libllbuild']:
install_library(args, build_dir, package_subpath, lib,
universal_lib_dir, toolchain_lib_dir,'llbuild')

# Create a universal shared-library file and install it into the toolchain lib
def install_library(args, build_dir, package_subpath, lib_name,
Expand Down Expand Up @@ -326,11 +330,9 @@ def install_binary_swift_modules(args, build_dir, toolchain_lib_dir):
install_module(args, build_dir, package_subpath, toolchain_lib_dir, module)

# swift-argument-parser
# TODO: Until the argument parser is used, avoid installing it into the toolchain
#package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser',
# product_subpath)
#install_module(args, build_dir, package_subpath, toolchain_lib_dir, 'ArgumentParser',
# 'swift-argument-parser')
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser',
product_subpath)
install_module(args, build_dir, package_subpath, toolchain_lib_dir, 'ArgumentParser')

# Install the modulemaps and headers of the driver's C module dependencies into the toolchain
# include directory
Expand Down