diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt --- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt +++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt @@ -114,6 +114,13 @@ timing.cpp ) +# Temporary hack until LLVM libc supports inttypes.h print format macros +# See: https://github.com/llvm/llvm-project/issues/63317#issuecomment-1591906241 +if(LLVM_LIBC_INCLUDE_SCUDO) + list(REMOVE_ITEM SCUDO_HEADERS timing.h) + list(REMOVE_ITEM SCUDO_SOURCES timing.cpp) +endif() + # Enable the necessary instruction set for scudo_crc32.cpp, if available. # Newer compiler versions use -mcrc32 rather than -msse4.2. if (COMPILER_RT_HAS_MCRC32_FLAG) diff --git a/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt --- a/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt +++ b/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt @@ -111,6 +111,12 @@ scudo_unit_test_main.cpp ) +# Temporary hack until LLVM libc supports inttypes.h print format macros +# See: https://github.com/llvm/llvm-project/issues/63317#issuecomment-1591906241 +if(LLVM_LIBC_INCLUDE_SCUDO) + list(REMOVE_ITEM SCUDO_UNIT_TEST_SOURCES timing_test.cpp) +endif() + add_scudo_unittest(ScudoUnitTest SOURCES ${SCUDO_UNIT_TEST_SOURCES})