[llvm] fa44d72 - [build] Fix runtimes build after 2e745ba6b0ba
Shoaib Meenai via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 29 12:19:30 PST 2020
Author: Shoaib Meenai
Date: 2020-01-29T12:16:40-08:00
New Revision: fa44d72b9e433c6c8d696f08bf138284f91b6958
URL: https://github.com/llvm/llvm-project/commit/fa44d72b9e433c6c8d696f08bf138284f91b6958
DIFF: https://github.com/llvm/llvm-project/commit/fa44d72b9e433c6c8d696f08bf138284f91b6958.diff
LOG: [build] Fix runtimes build after 2e745ba6b0ba
I missed the NOT in the condition; this part is actually responsible for
passing LLVM_ENABLE_RUNTIMES to the per-target runtime configures, which
in turn makes them actually build.
I'll put up a more general solution for review, but restore this in the
meantime to fix the runtimes build.
Added:
Modified:
llvm/runtimes/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 6e7db52dcdc1..8b911c2c2c5d 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -466,6 +466,11 @@ else() # if this is included from LLVM's CMake
endif()
endforeach()
+ if(NOT RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES OR RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
+ string(REPLACE ";" "|" LLVM_ENABLE_RUNTIMES_PASSTHROUGH "${LLVM_ENABLE_RUNTIMES}")
+ list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES_PASSTHROUGH})
+ endif()
+
if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)
list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link)
endif()
More information about the llvm-commits
mailing list