Skip to content

Commit e9df53a

Browse files
committed
[build-windows-toolchain] Minor cleanups.
- Add Swift vendor field. - Clean up unused dependencies. - Fix typo.
1 parent 85aa447 commit e9df53a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

utils/build-windows-toolchain.bat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ cmake ^
9999
-D PACKAGE_VENDOR="swift.org" ^
100100
-D CLANG_VENDOR="swift.org" ^
101101
-D CLANG_VENDOR_UTI="org.swift" ^
102+
-D SWIFT_VENDOR="swift.org" ^
102103
-D LLVM_APPEND_VC_REV=NO ^
103104
-D LLVM_VERSION_SUFFIX="" ^
104105

@@ -386,8 +387,6 @@ cmake ^
386387
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
387388
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
388389
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
389-
-D SQLite3_INCLUDE_DIR=%BuildRoot%\Library\sqlite-3.36.0\usr\include ^
390-
-D SQLite3_LIBRARY=%BuildRoot%\Library\sqlite-3.36.0\usr\lib\SQLite3.lib ^
391390

392391
-G Ninja ^
393392
-S %SourceRoot%\swift-driver || (exit /b)
@@ -461,7 +460,6 @@ cmake ^
461460
-D TSC_DIR=%BuildRoot%\7\cmake\modules ^
462461
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
463462
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
464-
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
465463
-D SwiftDriver_DIR=%BuildRoot%\11\cmake\modules ^
466464
-D SwiftCrypto_DIR=%BuildRoot%\12\cmake\modules ^
467465
-D SwiftCollections_DIR=%BuildRoot%\13\cmake\modules ^
@@ -591,7 +589,7 @@ endlocal
591589
setlocal enableextensions enabledelayedexpansion
592590

593591
:: Always enable symbolic links
594-
git config --global core.symlink true
592+
git config --global core.symlinks true
595593

596594
:: FIXME(compnerd) avoid the fresh clone
597595
rd /s /q zlib libxml2 sqlite icu curl

0 commit comments

Comments
 (0)