r287463 - [CMake] Fixing clang standalone build

Chris Bieneman via cfe-commits cfe-commits at lists.llvm.org
Sat Nov 19 13:14:59 PST 2016


Author: cbieneman
Date: Sat Nov 19 15:14:59 2016
New Revision: 287463

URL: http://llvm.org/viewvc/llvm-project?rev=287463&view=rev
Log:
[CMake] Fixing clang standalone build

I broke this in r287406 and r287407.

Modified:
    cfe/trunk/tools/clang-offload-bundler/CMakeLists.txt
    cfe/trunk/tools/driver/CMakeLists.txt

Modified: cfe/trunk/tools/clang-offload-bundler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-offload-bundler/CMakeLists.txt?rev=287463&r1=287462&r2=287463&view=diff
==============================================================================
--- cfe/trunk/tools/clang-offload-bundler/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-offload-bundler/CMakeLists.txt Sat Nov 19 15:14:59 2016
@@ -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

Modified: cfe/trunk/tools/driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/CMakeLists.txt?rev=287463&r1=287462&r2=287463&view=diff
==============================================================================
--- cfe/trunk/tools/driver/CMakeLists.txt (original)
+++ cfe/trunk/tools/driver/CMakeLists.txt Sat Nov 19 15:14:59 2016
@@ -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




More information about the cfe-commits mailing list