summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-config
diff options
context:
space:
mode:
authorJustin Bogner <mail@justinbogner.com>2016-12-21 21:19:00 +0000
committerJustin Bogner <mail@justinbogner.com>2016-12-21 21:19:00 +0000
commitc11760d4edb70218a19b03eb5146f669f2a1790f (patch)
tree5d2ce62663513484fd9d773ead88c45eaeca9781 /llvm/tools/llvm-config
parent084062803e8cebb41b80d16e56d62cb6db707a06 (diff)
downloadbcm5719-llvm-c11760d4edb70218a19b03eb5146f669f2a1790f.tar.gz
bcm5719-llvm-c11760d4edb70218a19b03eb5146f669f2a1790f.zip
cmake: Don't build llvm-config and tblgen concurrently in cross builds
This sets USES_TERMINAL for the native llvm-config build, so that it doesn't run at the same time as builds of other native tools (namely, tablegen). Without this, if you're very unlucky with the timing it's possible to be relinking libSupport as one of the tools is linking, causing a spurious failure. The tablegen build adopted USES_TERMINAL for this same reason in r280748. llvm-svn: 290271
Diffstat (limited to 'llvm/tools/llvm-config')
-rw-r--r--llvm/tools/llvm-config/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
index 744fa4e44d1..1f5db59beb5 100644
--- a/llvm/tools/llvm-config/CMakeLists.txt
+++ b/llvm/tools/llvm-config/CMakeLists.txt
@@ -69,7 +69,8 @@ if(CMAKE_CROSSCOMPILING)
COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURATION>
DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt
WORKING_DIRECTORY ${LLVM_NATIVE_BUILD}
- COMMENT "Building native llvm-config...")
+ COMMENT "Building native llvm-config..."
+ USES_TERMINAL)
add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE})
add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE)
OpenPOWER on IntegriCloud