Skip to content

Commit bb44c37

Browse files
Linaro / Windows: Use LLVM_CCACHE_BUILD instead of CMAKE_CXX_COMPILER_LAUNCHER (#464)
There's nothing wrong with the latter - except that LLVM_CCACHE_BUILD knows that it should not be enabling pre-compiled headers on Windows. See llvm/llvm-project#136856 We had a contributor report an issue with this, and it only got fixed when someone randomly managed to update the right files for an unrelated change. ``` /Fdtools\flang\lib\Parser\CMakeFiles\FortranParser.dir\FortranParser.pdb -c -- C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/flang/lib/Parser/preprocessor.cpp fatal error: file 'C:\Users\tcwg\llvm-worker\flang-arm64-windows-msvc\llvm-project\llvm\include\llvm\Support\Compiler.h' has been modified since the precompiled header 'C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/./cmake_pch.cxx.pch' was built: size changed (was 26948, now 27102) note: please rebuild precompiled header 'C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/./cmake_pch.cxx.pch' 1 error generated. ``` This sounds like a known issue, and if we use LLVM_CCACHE_BUILD, precompiled headers will be disabled. This is fine, our bots weren't relying on this anyway. As far as I could tell we don't customise the ccache install at all either, so the defaults are all fine for us. I've applied this to all 4 Windows bots: clang-arm64-windows-msvc clang-arm64-windows-msvc-2stage flang-arm64-windows-msvc lldb-aarch64-windows The problem is with flang specifically, but we might as well standardise across them all.
1 parent ba51397 commit bb44c37

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,7 @@
331331
"-DCLANG_DEFAULT_LINKER=lld",
332332
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
333333
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
334-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
335-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"])},
334+
"-DLLVM_CCACHE_BUILD=ON"])},
336335

337336
## ARMv8 check-all
338337
{'name' : "clang-armv8-quick",
@@ -665,8 +664,7 @@
665664
extra_cmake_args=[
666665
"-DCLANG_DEFAULT_LINKER=lld",
667666
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
668-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
669-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
667+
"-DLLVM_CCACHE_BUILD=ON",
670668
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])},
671669

672670
{'name' : 'clang-x64-windows-msvc',
@@ -1448,8 +1446,7 @@
14481446
clean=True,
14491447
test=True,
14501448
extra_cmake_args=[
1451-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
1452-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
1449+
"-DLLVM_CCACHE_BUILD=ON",
14531450
# Hardware breakpoints and watchpoints are not yet supported,
14541451
# https://github.com/llvm/llvm-project/issues/80665.
14551452
'-DLLDB_TEST_USER_ARGS=--skip-category=watchpoint',
@@ -2656,8 +2653,7 @@
26562653
"-DCLANG_DEFAULT_LINKER=lld",
26572654
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
26582655
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
2659-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
2660-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"])},
2656+
"-DLLVM_CCACHE_BUILD=ON"])},
26612657

26622658
{'name' : 'ppc64-flang-aix',
26632659
'tags' : ["flang", "ppc", "ppc64", "aix"],

0 commit comments

Comments
 (0)