Skip to content

Commit 5401b9a

Browse files
committed
[Build Script Helper] Install libArgumentParserToolInfo.dylib into the toolchain
This is now a dependency of the main `libArgumentParser.dylib` and not having it installed casuses `Library not loaded` errors when using the toolchain. Resolves rdar://86859779
1 parent a08d383 commit 5401b9a

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Utilities/build-script-helper.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,23 +328,24 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar
328328
install_library(args, build_dir, package_subpath, lib,
329329
universal_lib_dir, toolchain_lib_dir, 'swift-driver', targets)
330330

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

337-
# Instal the swift-system shared library into the toolchain lib
337+
# Install the swift-system shared library into the toolchain lib
338338
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-system')
339339
install_library(args, build_dir, package_subpath, 'libSystemPackage',
340340
universal_lib_dir, toolchain_lib_dir, 'swift-system', targets)
341341

342-
# Instal the swift-argument-parser shared library into the toolchain lib
342+
# Install the swift-argument-parser shared libraries into the toolchain lib
343343
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser')
344-
install_library(args, build_dir, package_subpath, 'libArgumentParser',
345-
universal_lib_dir, toolchain_lib_dir,'swift-argument-parser', targets)
344+
for lib in ['libArgumentParser', 'libArgumentParserToolInfo']:
345+
install_library(args, build_dir, package_subpath, lib,
346+
universal_lib_dir, toolchain_lib_dir,'swift-argument-parser', targets)
346347

347-
# Instal the llbuild core shared libraries into the toolchain lib
348+
# Install the llbuild core shared libraries into the toolchain lib
348349
package_subpath = os.path.join(args.configuration, 'dependencies', 'llbuild')
349350
for lib in ['libllbuildSwift', 'libllbuild']:
350351
install_library(args, build_dir, package_subpath, lib,

0 commit comments

Comments
 (0)