Merge pull request swiftlang#26269 from benlangmuir/ninja-sk-isdb-build-script

benlangmuir · web-flow · commit 07b3b8e3009b · 2019-07-22T13:43:20.000-07:00
[build-script] Pass ninja path to indexstore-db/sourcekit-lsp
diff --git a/utils/build-script b/utils/build-script
@@ -136,7 +136,8 @@ class BuildScriptInvocation(object):
     def apply_default_arguments(toolchain, args):
         # Infer if ninja is required
         ninja_required = (
-            args.cmake_generator == 'Ninja' or args.build_foundation)
+            args.cmake_generator == 'Ninja' or args.build_foundation
+            or args.build_sourcekitlsp or args.build_indexstoredb)
         if ninja_required and toolchain.ninja is None:
             args.build_ninja = True
 
diff --git a/utils/swift_build_support/swift_build_support/products/indexstoredb.py b/utils/swift_build_support/swift_build_support/products/indexstoredb.py
@@ -52,5 +52,6 @@ def run_build_script_helper(action, host_target, product, args):
         '--build-path', product.build_dir,
         '--configuration', configuration,
         '--toolchain', toolchain_path,
+        '--ninja-bin', product.toolchain.ninja,
     ]
     shell.call(helper_cmd)

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,6 @@ def run_build_script_helper(action, host_target, product, args):`
`52`	`52`	`'--build-path', product.build_dir,`
`53`	`53`	`'--configuration', configuration,`
`54`	`54`	`'--toolchain', toolchain_path,`
	`55`	`+ '--ninja-bin', product.toolchain.ninja,`
`55`	`56`	`]`
`56`	`57`	`shell.call(helper_cmd)`