@@ -205,14 +205,19 @@ def bootstrap(args):
205
205
else :
206
206
llbuild_dir = os .path .join (args .llbuild_build_dir , "cmake/modules" )
207
207
llbuild_arg = "-DLLBuild_DIR=" + llbuild_dir
208
+
209
+ swiftpm_build_path = os .path .join (args .target_path , args .conf )
210
+
208
211
cmd = [
209
212
"cmake" , "-G" , "Ninja" ,
210
213
"-DCMAKE_BUILD_TYPE:=Debug" ,
211
214
"-DCMAKE_C_COMPILER:=clang" ,
212
215
llbuild_arg ,
213
216
"-DCMAKE_Swift_FLAGS=" + cmake_swift_flags ,
214
217
"-DUSE_VENDORED_TSC=ON" ,
215
- g_project_root
218
+ "-DSWIFTPM_BUILD_DIR=" + swiftpm_build_path ,
219
+ "-DCMAKE_INSTALL_PREFIX=" + args .install_prefixes [0 ],
220
+ g_project_root ,
216
221
]
217
222
print (' ' .join (cmd ))
218
223
subprocess .check_call (cmd , cwd = bootstrap_path )
@@ -306,6 +311,7 @@ def main():
306
311
307
312
build_target = "x86_64-apple-macosx"
308
313
args .target_path = os .path .join (args .build_path , build_target )
314
+ args .conf = 'debug' if args .release else 'release'
309
315
310
316
if "build-pd" in build_actions :
311
317
build_runtimes_only (args )
@@ -326,5 +332,8 @@ def main():
326
332
# Build SwiftPM with the bootstrapped version.
327
333
build_swiftpm (args )
328
334
335
+ if "install" in build_actions :
336
+ subprocess .check_call (["ninja" , "install" ], cwd = args .bootstrap_path )
337
+
329
338
if __name__ == '__main__' :
330
339
main ()
0 commit comments