Skip to content

Commit 3c8fbec

Browse files
committed
[new-bootstrap] Add --install-libspm
1 parent 60a3d43 commit 3c8fbec

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Utilities/BuildExtras/Install/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ install(FILES
88
${SWIFTPM_BUILD_DIR}/swiftpm-xctest-helper
99
DESTINATION libexec/swift/pm)
1010

11+
if(INSTALL_LIBSWIFTPM)
12+
1113
list(APPEND LIBSPM_MODULES TSCLibc)
1214
list(APPEND LIBSPM_MODULES TSCBasic)
1315
list(APPEND LIBSPM_MODULES TSCUtility)
@@ -37,3 +39,4 @@ install(DIRECTORY
3739
install(FILES
3840
${SWIFTPM_BUILD_DIR}/libSwiftPM${CMAKE_SHARED_LIBRARY_SUFFIX}
3941
DESTINATION local/lib/swift/pm)
42+
endif()

Utilities/new-bootstrap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def bootstrap(args):
213213
"-DUSE_VENDORED_TSC=ON",
214214
"-DSWIFTPM_BUILD_DIR=" + swiftpm_build_path,
215215
"-DCMAKE_INSTALL_PREFIX=" + args.install_prefixes[0],
216+
"-DINSTALL_LIBSWIFTPM=" + ("ON" if args.install_libspm else "OFF"),
216217
g_project_root,
217218
]
218219
print(' '.join(cmd))
@@ -299,6 +300,8 @@ def main():
299300
help="Path to llbuild build directory")
300301
parser.add_argument("--release", action="store_true",
301302
help="Build stage 2 for release")
303+
parser.add_argument("--install-libspm", action="store_true",
304+
help="Install libSwiftPM")
302305
parser.add_argument("--prefix", dest="install_prefixes", nargs='*',
303306
help="use PATHS as the prefixes for installing "
304307
"[%(default)s]",

0 commit comments

Comments
 (0)