[compiler-rt] 3fb4d45 - Revert "[cmake] Explicitly disable download step"
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 19 15:14:58 PDT 2023
Author: Vitaly Buka
Date: 2023-04-19T15:14:35-07:00
New Revision: 3fb4d458666378965f3179c2f70c423c399839df
URL: https://github.com/llvm/llvm-project/commit/3fb4d458666378965f3179c2f70c423c399839df
DIFF: https://github.com/llvm/llvm-project/commit/3fb4d458666378965f3179c2f70c423c399839df.diff
LOG: Revert "[cmake] Explicitly disable download step"
This does not help. The build is broken because compiler-rt-clear
deletes cmake generated files in STAMP_DIR/
This reverts commit da89ed99a16920e5986b14853d297322ccf7109e.
Added:
Modified:
clang/CMakeLists.txt
compiler-rt/cmake/Modules/AddCompilerRT.cmake
Removed:
################################################################################
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 6a722045fbc9b..1fff005d65251 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -804,7 +804,6 @@ 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
@@ -916,7 +915,6 @@ 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 13bbcf20f517f..2771a4063c1df 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -698,7 +698,6 @@ 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
More information about the llvm-commits
mailing list