CMake: Fixed parallel build problem related to native tblgen when

cross-compiling.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73180 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c2c16bdd296f2d96a2ec148594abc730bf74a03..3e7b8c16f11ada929ba202fbeb169a9c91db7bf8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,8 @@ set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${LLVM_LIBS} )
 
 set(LLVM_TABLEGEN "tblgen" CACHE
   STRING "Native TableGen executable. Saves building one when cross-compiling.")
+# Effective tblgen executable to be used:
+set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
 
 add_subdirectory(utils/TableGen)
 

diff --git a/cmake/modules/CrossCompileLLVM.cmake b/cmake/modules/CrossCompileLLVM.cmake
index f638d67a30d1a0458004e1b38cf125450afa28d4..138ff0e9fe657859af1f87c38ec0b5d1c3de5a90 100644 (file)
--- a/cmake/modules/CrossCompileLLVM.cmake
+++ b/cmake/modules/CrossCompileLLVM.cmake
@@ -1,7 +1,7 @@
 \r
 if( ${LLVM_TABLEGEN} STREQUAL "tblgen" )\r
   set(CX_NATIVE_TG_DIR "${CMAKE_BINARY_DIR}/native")\r
-  set(LLVM_TABLEGEN "${CX_NATIVE_TG_DIR}/bin/tblgen")\r
+  set(LLVM_TABLEGEN_EXE "${CX_NATIVE_TG_DIR}/bin/tblgen")\r
 \r
   add_custom_command(OUTPUT ${CX_NATIVE_TG_DIR}\r
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CX_NATIVE_TG_DIR}\r
@@ -13,12 +13,12 @@ if( ${LLVM_TABLEGEN} STREQUAL "tblgen" )
     DEPENDS ${CX_NATIVE_TG_DIR}\r
     COMMENT "Configuring native TableGen...")\r
 \r
-  add_custom_command(OUTPUT ${LLVM_TABLEGEN}\r
+  add_custom_command(OUTPUT ${LLVM_TABLEGEN_EXE}\r
     COMMAND ${CMAKE_BUILD_TOOL}\r
     DEPENDS ${CX_NATIVE_TG_DIR}/CMakeCache.txt\r
     WORKING_DIRECTORY ${CX_NATIVE_TG_DIR}/utils/TableGen\r
     COMMENT "Building native TableGen...")\r
-  add_custom_target(NativeTableGen DEPENDS ${LLVM_TABLEGEN})\r
+  add_custom_target(NativeTableGen DEPENDS ${LLVM_TABLEGEN_EXE})\r
 \r
   add_dependencies(tblgen NativeTableGen)\r
 \r

diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake
index adb22c726b927907b4bc7e8019b042e06fab5ef3..16c732b089381bcf1a4651b7f4288986e2305c8f 100644 (file)
--- a/cmake/modules/TableGen.cmake
+++ b/cmake/modules/TableGen.cmake
@@ -6,11 +6,11 @@ macro(tablegen ofn)
   file(GLOB all_tds "*.td")
 
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
-    COMMAND ${LLVM_TABLEGEN} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND ${LLVM_TABLEGEN_EXE} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
     -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} 
     -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
-    DEPENDS ${LLVM_TABLEGEN} ${all_tds}
+    DEPENDS tblgen ${all_tds}
     COMMENT "Building ${ofn}.tmp..."
     )
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}