From da89ed99a16920e5986b14853d297322ccf7109e Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Wed, 19 Apr 2023 12:51:00 -0700 Subject: [PATCH] [cmake] Explicitly disable download step Fixes the following on cmake version 3.24.2: 'tools/clang/runtime/compiler-rt-stamps/compiler-rt-source_dirinfo.txt', needed by 'tools/clang/runtime/compiler-rt-stamps/compiler-rt-download', missing and no known rule to make it Maybe related to https://cmake.org/cmake/help/latest/release/3.24.html#modules --- clang/CMakeLists.txt | 2 ++ compiler-rt/cmake/Modules/AddCompilerRT.cmake | 1 + 2 files changed, 3 insertions(+) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 1fff005..6a72204 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -804,6 +804,7 @@ if (CLANG_ENABLE_BOOTSTRAP) --config ${build_configuration} ${build_tool_args} INSTALL_COMMAND "" + DOWNLOAD_COMMAND "" STEP_TARGETS configure build USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 @@ -915,6 +916,7 @@ if (CLANG_BOLT_INSTRUMENT AND NOT LLVM_BUILD_INSTRUMENTED) --config ${build_configuration} --target ${CLANG_BOLT_INSTRUMENT_TARGETS} INSTALL_COMMAND "" + DOWNLOAD_COMMAND "" STEP_TARGETS configure build USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 2771a40..13bbcf2 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -698,6 +698,7 @@ macro(add_custom_libcxx name prefix) -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON ${LIBCXX_CMAKE_ARGS} INSTALL_COMMAND "" + DOWNLOAD_COMMAND "" STEP_TARGETS configure build BUILD_ALWAYS 1 USES_TERMINAL_CONFIGURE 1 -- 2.7.4