From b1ff58de6ea8a246fa5306cd4228cc8d6141dab5 Mon Sep 17 00:00:00 2001 From: Chris Bieneman <beanz@apple.com> Date: Sat, 19 Nov 2016 21:14:59 +0000 Subject: [PATCH] [CMake] Fixing clang standalone build I broke this in r287406 and r287407. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@287463 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-offload-bundler/CMakeLists.txt | 6 +++++- tools/driver/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt index d585406a42c..6161d08ae58 100644 --- a/tools/clang-offload-bundler/CMakeLists.txt +++ b/tools/clang-offload-bundler/CMakeLists.txt @@ -1,10 +1,14 @@ set(LLVM_LINK_COMPONENTS BitWriter Core Object Support) +if(NOT CLANG_BUILT_STANDALONE) + set(tablegen_deps intrinsics_gen) +endif() + add_clang_executable(clang-offload-bundler ClangOffloadBundler.cpp DEPENDS - intrinsics_gen + ${tablegen_deps} ) set(CLANG_OFFLOAD_BUNDLER_LIB_DEPS diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt index fac789c8324..49bde947f4c 100644 --- a/tools/driver/CMakeLists.txt +++ b/tools/driver/CMakeLists.txt @@ -24,13 +24,17 @@ if(CLANG_PLUGIN_SUPPORT) set(LLVM_NO_DEAD_STRIP 1) endif() +if(NOT CLANG_BUILT_STANDALONE) + set(tablegen_deps intrinsics_gen) +endif() + add_clang_tool(clang driver.cpp cc1_main.cpp cc1as_main.cpp DEPENDS - intrinsics_gen + ${tablegen_deps} ) target_link_libraries(clang -- GitLab