Skip to content

Commit a054f52

Browse files
committed
[CI] Update Windows premerge testing to use clang-cl.exe
Now that the Windows container contains clang, use it for building the premerge tests. Measurements show this is significantly faster than using msvc cl. Note we had to disable two warnings -Wc++98-compat and -Wc++14-compat, to make this work with 'check-mlir' on Windows (clang generates a lot of warnings that msvc cl does not).
1 parent c97256d commit a054f52

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.ci/monolithic-windows.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ runtimes_targets="${4}"
2323
start-group "CMake"
2424
pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
2525

26-
export CC=cl
27-
export CXX=cl
26+
export CC=C:\clang\clang-msvc\bin\clang-cl.exe
27+
export CXX=C:\clang\clang-msvc\bin\clang-cl.exe
2828
export LD=link
2929

3030
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
@@ -49,10 +49,12 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4949
-D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
5050
-D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
5151
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
52+
-D CMAKE_CXX_FLAGS="-Wno-c++98-compat -Wno-c++14-compat" \
5253
-D LLVM_ENABLE_RUNTIMES="${runtimes}"
5354

5455
start-group "ninja"
5556

57+
5658
# Targets are not escaped as they are passed as separate arguments.
5759
ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
5860
cp ${BUILD_DIR}/.ninja_log ninja.ninja_log

0 commit comments

Comments
 (0)