diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-07-10 19:13:33 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-07-10 19:13:33 +0000 |
| commit | 071f23bbb928a2aee9f021078aaf5674526fc7d2 (patch) | |
| tree | 2de3013e91af5fe78313cf2aefe5544c4c418263 /runtimes | |
| parent | f3303f010c0400241b1056988c8d6fe53168452c (diff) | |
[CMake] Set per-runtime library directory suffix in runtimes build
Do not use LLVM_RUNTIMES_LIBDIR_SUFFIX variable which is an internal
variable used by the runtimes build from individual runtimes, instead
set per-runtime librarhy directory suffix variable which is necessary
for the sanitized runtimes build to install libraries into correct
location.
Differential Revision: https://reviews.llvm.org/D49121
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@336713 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtimes')
| -rw-r--r-- | runtimes/CMakeLists.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 3474e1ea98d..d14a08ebace 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -120,13 +120,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_REQUIRED_FLAGS ${SAFE_CMAKE_REQUIRED_FLAGS}) set(CMAKE_REQUIRED_LIBRARIES ${SAFE_CMAKE_REQUIRED_LIBRARIES}) - if(NOT LLVM_RUNTIMES_PREFIX) - set(LLVM_RUNTIMES_PREFIX "${LLVM_RUNTIMES_TARGET}/") - endif() - - string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION - ${PACKAGE_VERSION}) - foreach(entry ${runtimes}) get_filename_component(projName ${entry} NAME) @@ -136,15 +129,15 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) # The subdirectories need to treat this as standalone builds set(${canon_name}_STANDALONE_BUILD On) + if(LLVM_RUNTIMES_LIBDIR_SUFFIX) + set(${canon_name}_LIBDIR_SUFFIX "${LLVM_RUNTIMES_LIBDIR_SUFFIX}" CACHE STRING "" FORCE) + endif() + # Setting a variable to let sub-projects detect which other projects # will be included under here. set(HAVE_${canon_name} On) endforeach() - set(SAFE_LLVM_BINARY_DIR ${LLVM_BINARY_DIR}) - set(SAFE_LLVM_LIBRARY_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(SAFE_LLVM_RUNTIME_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) - # We do this in two loops so that HAVE_* is set for each runtime before the # other runtimes are added. foreach(entry ${runtimes}) @@ -167,14 +160,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND RUNTIMES_LIT_PARAMS ${LLVM_LIT_PARAMS}) list(APPEND RUNTIMES_LIT_DEPENDS ${LLVM_LIT_DEPENDS}) list(APPEND RUNTIMES_LIT_EXTRA_ARGS ${LLVM_LIT_EXTRA_ARGS}) - - if(LLVM_RUNTIMES_TARGET) - if(NOT "${projName}" MATCHES "compiler-rt") - set(LLVM_BINARY_DIR "${SAFE_LLVM_BINARY_DIR}") - set(LLVM_LIBRARY_OUTPUT_INTDIR "${SAFE_LLVM_LIBRARY_OUTPUT_INTDIR}") - set(LLVM_RUNTIME_OUTPUT_INTDIR "${SAFE_LLVM_RUNTIME_OUTPUT_INTDIR}") - endif() - endif() endforeach() if(LLVM_INCLUDE_TESTS) |