[PATCH] D39715: [CMake][runtimes] Set compiler as working even for default target
Petr Hosek via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 6 23:41:42 PST 2017
phosek created this revision.
Herald added a subscriber: mgorny.
Even when building builtins and runtimes for the default target
we shouldn't assume that the just built compiler is already useable.
When the compiler uses compiler-rt and libc++ as the default runtime
and C++ library, it won't be usable until we finish building runtimes.
Repository:
rL LLVM
https://reviews.llvm.org/D39715
Files:
runtimes/CMakeLists.txt
Index: runtimes/CMakeLists.txt
===================================================================
--- runtimes/CMakeLists.txt
+++ runtimes/CMakeLists.txt
@@ -85,7 +85,6 @@
# Handle common options used by all runtimes.
include(AddLLVM)
- include(HandleLLVMOptions)
set(CMAKE_REQUIRED_FLAGS ${SAFE_CMAKE_REQUIRED_FLAGS})
set(CMAKE_REQUIRED_LIBRARIES ${SAFE_CMAKE_REQUIRED_LIBRARIES})
@@ -216,6 +215,8 @@
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE}
+ -DCMAKE_C_COMPILER_WORKS=ON
+ -DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES COMPILER_RT
USE_TOOLCHAIN
${EXTRA_ARGS})
@@ -244,9 +245,9 @@
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${target}
-DCMAKE_ASM_COMPILER_TARGET=${target}
- -DCMAKE_C_COMPILER_WORKS=On
- -DCMAKE_ASM_COMPILER_WORKS=On
- -DCOMPILER_RT_DEFAULT_TARGET_ONLY=On
+ -DCMAKE_C_COMPILER_WORKS=ON
+ -DCMAKE_ASM_COMPILER_WORKS=ON
+ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
${${target}_extra_args}
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib
PASSTHROUGH_PREFIXES COMPILER_RT
@@ -324,6 +325,9 @@
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
+ -DCMAKE_C_COMPILER_WORKS=ON
+ -DCMAKE_CXX_COMPILER_WORKS=ON
+ -DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES ${prefixes}
EXTRA_TARGETS ${extra_targets}
${test_targets}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39715.121841.patch
Type: text/x-patch
Size: 2541 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171107/85f5cc2c/attachment.bin>
More information about the llvm-commits
mailing list