Skip to content

Commit 6f3cdb6

Browse files
committed
Update Windows Build Scripts
1 parent f9cff13 commit 6f3cdb6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

utils/build-windows.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ git -C "%source_root%\swift" checkout-index --force --all
122122
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-integration-tests"
123123
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swiftpm"
124124
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-stress-tester"
125-
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-syntax"
126125
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-tools-support-core"
127126
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-xcode-playground-support"
128127
@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository tensorflow-swift-apis"
@@ -282,6 +281,8 @@ cmake^
282281
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
283282
-DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
284283
-DSWIFT_LIT_ARGS="--time-tests"^
284+
-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH=%source_root%\swift-syntax^
285+
-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH=%source_root%\swift-syntax^
285286
-S "%source_root%\swift" %exitOnError%
286287

287288
cmake --build "%build_root%\swift" %exitOnError%

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ def convert_to_impl_arguments(self):
245245
args.extra_cmake_options.append(
246246
'-DSWIFT_BACK_DEPLOY_CONCURRENCY:BOOL=TRUE')
247247

248+
swift_syntax_src = os.path.join(self.workspace.source_root,
249+
"swift-syntax")
250+
args.extra_cmake_options.append(
251+
'-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH={}'.format(swift_syntax_src))
252+
248253
# Then add subproject install flags that either skip building them /or/
249254
# if we are going to build them and install_all is set, we also install
250255
# them.

0 commit comments

Comments
 (0)