Skip to content

Commit 72c64ac

Browse files
committed
Build indexstore-db and sourcekit-lsp in a unified build
1 parent 38648ec commit 72c64ac

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utils/swift_build_support/swift_build_support/products/indexstoredb.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
import os
1414

15+
from build_swift.build_swift.constants import MULTIROOT_DATA_FILE_PATH
16+
1517
from . import cmark
1618
from . import foundation
1719
from . import libcxx
@@ -41,6 +43,10 @@ def is_build_script_impl_product(cls):
4143
def is_before_build_script_impl_product(cls):
4244
return False
4345

46+
@classmethod
47+
def is_swiftpm_unified_build_product(cls):
48+
return True
49+
4450
def should_build(self, host_target):
4551
return True
4652

@@ -95,6 +101,7 @@ def run_build_script_helper(action, host_target, product, args,
95101
'--configuration', configuration,
96102
'--toolchain', toolchain_path,
97103
'--ninja-bin', product.toolchain.ninja,
104+
'--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
98105
]
99106
if args.verbose_build:
100107
helper_cmd.append('--verbose')

utils/swift_build_support/swift_build_support/products/sourcekitlsp.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ def is_build_script_impl_product(cls):
3737
def is_before_build_script_impl_product(cls):
3838
return False
3939

40+
@classmethod
41+
def is_swiftpm_unified_build_product(cls):
42+
return True
43+
4044
def should_build(self, host_target):
4145
return True
4246

0 commit comments

Comments
 (0)