Skip to content

Commit 5ad543a

Browse files
committed
[Windows] Don't build earlyswiftsyntax in Windows
build-windows-toolchain.bat used to build and install 'swift-syntax' for the compiler. Now that swift-syntax is built as a part of 'swift' build. So no need to built it separately anymore.
1 parent 99d8d88 commit 5ad543a

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

utils/build-windows-toolchain.bat

-26
Original file line numberDiff line numberDiff line change
@@ -190,31 +190,6 @@ cmake --build "%BuildRoot%\curl" --target install || (exit /b)
190190

191191
path %BuildRoot%\toolchains\5.9.0\PFiles64\Swift\runtime-development\usr\bin;%BuildRoot%\toolchains\5.9.0\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;%Path%
192192

193-
:: Build Swift Syntax
194-
cmake ^
195-
-B "%BuildRoot%\99" ^
196-
197-
-D BUILD_SHARED_LIBS=YES ^
198-
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
199-
-D CMAKE_C_COMPILER=cl.exe ^
200-
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
201-
-D CMAKE_CXX_COMPILER=cl ^
202-
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
203-
-D CMAKE_MT=mt ^
204-
-D CMAKE_Swift_COMPILER=%BuildRoot%/toolchains/5.9.0/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^
205-
-D CMAKE_Swift_FLAGS="-sdk %BuildRoot%/toolchains/5.9.0/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
206-
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
207-
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
208-
209-
-D CMAKE_INSTALL_PREFIX="%InstallRoot%" ^
210-
211-
-D SWIFT_SYNTAX_ENABLE_WMO_PRE_3_26=YES ^
212-
213-
-G Ninja ^
214-
-S %SourceRoot%\swift-syntax || (exit /b)
215-
cmake --build %BuildRoot%\99 || (exit /b)
216-
cmake --build %BuildRoot%\99 --target install || (exit /b)
217-
218193
:: Build Toolchain
219194
cmake ^
220195
-B "%BuildRoot%\1" ^
@@ -258,7 +233,6 @@ cmake ^
258233
-D LLVM_EXTERNAL_CMARK_SOURCE_DIR="%SourceRoot%\cmark" ^
259234
-D PYTHON_HOME=%PYTHON_HOME% ^
260235
-D PYTHON_EXECUTABLE=%PYTHON_HOME%\python.exe ^
261-
-D SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR="%BuildRoot%\99" ^
262236
-D SWIFT_PATH_TO_LIBDISPATCH_SOURCE="%SourceRoot%\swift-corelibs-libdispatch" ^
263237
-D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE="%SourceRoot%\swift-syntax" ^
264238
-D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=%SourceRoot%\swift-experimental-string-processing ^

0 commit comments

Comments
 (0)