summaryrefslogtreecommitdiffstats
path: root/llvm/runtimes
diff options
context:
space:
mode:
authorChris Bieneman <chris.bieneman@me.com>2019-05-29 18:37:49 +0000
committerChris Bieneman <chris.bieneman@me.com>2019-05-29 18:37:49 +0000
commit96c500aab4f6ce8c10b26e1b2a45db21cfcd07b8 (patch)
treea8c2971b912d3a8814560298512db258df1e8aa5 /llvm/runtimes
parent5382803b048329627c8b1588aeffe177edb8825f (diff)
downloadbcm5719-llvm-96c500aab4f6ce8c10b26e1b2a45db21cfcd07b8.tar.gz
bcm5719-llvm-96c500aab4f6ce8c10b26e1b2a45db21cfcd07b8.zip
[CMake] [Runtimes] Set *_STANDALONE_BUILD
Summary: The runtimes use `*_STANDALONE_BUILD=OFF` to signify that clang is an in-tree target. This is not the case with the runtime builds, so we really need this set to `ON`. In order to resolve the issues phosek was having with checks, we should use checks that don't link. We can use compiler-rt's `try_compile_only` as a basis for that. This patch is *required* to be able to run the runtime libraries check-* targets. Reviewers: smeenai, phosek, compnerd Reviewed By: phosek Subscribers: mgorny, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D62410 llvm-svn: 362007
Diffstat (limited to 'llvm/runtimes')
-rw-r--r--llvm/runtimes/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index acf4f3e3e57..51ad2371f44 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -128,6 +128,12 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
string(REPLACE "-" "_" canon_name ${projName})
string(TOUPPER ${canon_name} canon_name)
+ # The subdirectories need to treat this as standalone builds. D57992 tried
+ # to get rid of this, but the runtimes treat *_STANDALONE_BUILD=OFF as if
+ # llvm & clang are configured in the same CMake, and setup dependencies
+ # against their targets.
+ set(${canon_name}_STANDALONE_BUILD ON)
+
if(LLVM_RUNTIMES_LIBDIR_SUBDIR)
set(${canon_name}_LIBDIR_SUBDIR "${LLVM_RUNTIMES_LIBDIR_SUBDIR}" CACHE STRING "" FORCE)
endif()
OpenPOWER on IntegriCloud