summaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2019-02-09 03:06:56 +0000
committerPetr Hosek <phosek@chromium.org>2019-02-09 03:06:56 +0000
commit3d4cb75dd58b72da67fbf5c45c7c7951cf567416 (patch)
treec09259e970a60ad2df14cc03d24dc263e205d5ff /cmake/Modules
parent46220a465d715e04f08de10d8969e3d9a059df6f (diff)
downloadcompiler-rt-3d4cb75dd58b72da67fbf5c45c7c7951cf567416.tar.gz
[CMake] Don't set <PROJECT>_STANDALONE_BUILD
We shouldn't be treating runtimes builds as standalone builds since we have enough of the context loaded into the runtimes environment. Differential Revision: https://reviews.llvm.org/D57992 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@353601 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/AddCompilerRT.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
index 87f66c0c3..73f3a8bee 100644
--- a/cmake/Modules/AddCompilerRT.cmake
+++ b/cmake/Modules/AddCompilerRT.cmake
@@ -515,7 +515,7 @@ macro(add_custom_libcxx name prefix)
if(LIBCXX_USE_TOOLCHAIN)
set(compiler_args -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER}
-DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER})
- if(NOT COMPILER_RT_STANDALONE_BUILD)
+ if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
set(toolchain_deps $<TARGET_FILE:clang>)
set(force_deps DEPENDS $<TARGET_FILE:clang>)
endif()