Skip to content

Commit f500321

Browse files
committed
[build-windows-toolchain] Enable building on non-UTF-8 Windows machine
`cl` will assume source and execution to be in local charset, so we should pass in `/utf-8` flags or prefer `clang-cl` instead.
1 parent e9df53a commit f500321

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build-windows-toolchain.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ cmake ^
8585

8686
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
8787
-D CMAKE_C_COMPILER=cl ^
88-
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
88+
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy /utf-8" ^
8989
-D CMAKE_CXX_COMPILER=cl ^
90-
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
90+
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy /utf-8" ^
9191
-D CMAKE_MT=mt ^
9292
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
9393
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
@@ -398,9 +398,9 @@ cmake ^
398398
-B %BuildRoot%\12 ^
399399

400400
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
401-
-D CMAKE_C_COMPILER=cl ^
401+
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
402402
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
403-
-D CMAKE_CXX_COMPILER=cl ^
403+
-D CMAKE_CXX_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
404404
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
405405
-D CMAKE_MT=mt ^
406406
-D CMAKE_Swift_COMPILER=%BuildRoot%/1/bin/swiftc.exe ^

0 commit comments

Comments
 (0)