From 85a2cffca4d0b1e8359a471199b1fa814b3ef5aa Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Thu, 18 Aug 2016 21:41:21 +0000 Subject: [PATCH] [CMake] Make llvm-config implicit dependency for subprojects The subproject interface being used for runtime libraries expects that llvm-config is passed into the subproject for consumption. We currently do this for every subproject, so we should expect that all LLVM ExternalProjects depend on llvm-config for the time being. Eventually I'd like to see the sub-projects using LLVMConfig.cmake instead of the llvm-config binary, but that will take time to roll out. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@279155 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/LLVMExternalProjectUtils.cmake | 2 +- runtimes/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/LLVMExternalProjectUtils.cmake b/cmake/modules/LLVMExternalProjectUtils.cmake index 3e7355d4d6b2..efe47e73441b 100644 --- a/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/cmake/modules/LLVMExternalProjectUtils.cmake @@ -120,7 +120,7 @@ function(llvm_ExternalProject_Add name source_dir) endif() ExternalProject_Add(${name} - DEPENDS ${ARG_DEPENDS} + DEPENDS ${ARG_DEPENDS} llvm-config ${name}-clobber PREFIX ${CMAKE_BINARY_DIR}/projects/${name} SOURCE_DIR ${source_dir} diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 4fe5f0036fc9..a155cacb75b7 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -81,7 +81,7 @@ else() # if this is included from LLVM's CMake # together in a single CMake invocaiton. llvm_ExternalProject_Add(runtimes ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${deps} llvm-config + DEPENDS ${deps} # Builtins were built separately above CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off PASSTHROUGH_PREFIXES ${prefixes}