[llvm-commits] [llvm] r58950 - in /llvm/trunk: CMakeLists.txt cmake/modules/CrossCompileLLVM.cmake

[Oscar Fuentes]

Author: ofv
Date: Sun Nov  9 19:32:14 2008
New Revision: 58950

URL: http://llvm.org/viewvc/llvm-project?rev=58950&view=rev
Log:
CMake: Non-working code for auto-building the native tblgen util when
cross-compiling.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/CrossCompileLLVM.cmake

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=58950&r1=58949&r2=58950&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Sun Nov  9 19:32:14 2008
@@ -114,12 +114,13 @@
 set(LLVM_TABLEGEN "tblgen" CACHE
   STRING "Native TableGen executable.")
 
+add_subdirectory(utils/TableGen)
+
 if( CMAKE_CROSSCOMPILING )
+  # This adds a dependency on target `tblgen', so must go after utils/TableGen
   include( CrossCompileLLVM )
 endif( CMAKE_CROSSCOMPILING )
 
-add_subdirectory(utils/TableGen)
-
 add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
   COMMAND ${LLVM_TABLEGEN} -gen-intrinsic -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen
   DEPENDS tblgen

Modified: llvm/trunk/cmake/modules/CrossCompileLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CrossCompileLLVM.cmake?rev=58950&r1=58949&r2=58950&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/CrossCompileLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/CrossCompileLLVM.cmake Sun Nov  9 19:32:14 2008
@@ -1,6 +1,42 @@
-# TODO: Build a native tblgen when cross-compiling, if the user
-# didn't set LLVM_TABLEGEN. Then, remove this check:
-if( CMAKE_CROSSCOMPILING AND ${LLVM_TABLEGEN} STREQUAL "tblgen" )
+
+if( ${LLVM_TABLEGEN} STREQUAL "tblgen" )
+  # TODO: remove this when autobuilding the native tblgen works.
   message(FATAL_ERROR
     "Set LLVM_TABLEGEN to the full route to a native tblgen executable")
+
+  message(STATUS "Configuring native TableGen...")
+  set(CX_NATIVE_TG_DIR "${CMAKE_BINARY_DIR}/native")
+
+  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CX_NATIVE_TG_DIR}
+    RESULT_VARIABLE CX_NATIVE_TG_RV)
+  if( NOT CX_NATIVE_TG_RV EQUAL 0 )
+    message(FATAL_ERROR "Failed to create directory ${CX_NATIVE_TG_DIR}")
+  endif()
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -UMAKE_TOOLCHAIN_FILE -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CX_NATIVE_TG_DIR}
+    RESULT_VARIABLE CX_NATIVE_TG_RV
+    ERROR_VARIABLE CX_NATIVE_TG_ERROR)
+  if( NOT CX_NATIVE_TG_RV EQUAL 0 )
+    message(FATAL_ERROR
+      "Error while configuring native TableGen:\n${CX_NATIVE_TG_ERROR}")
+  endif()
+
+  message(STATUS "Native TableGen configured.")
+
+  set(LLVM_TABLEGEN "${CX_NATIVE_TG_DIR}/bin/tblgen")
+
+  add_custom_command(OUTPUT ${LLVM_TABLEGEN}
+    COMMAND ${CMAKE_BUILD_TOOL} -C ${CX_NATIVE_TG_DIR}/utils/TableGen
+    COMMENT "Building native TableGen...")
+  add_custom_target(NativeTableGen DEPENDS ${LLVM_TABLEGEN})
+  add_dependencies(tblgen NativeTableGen)
+
+  # TODO: We should clean the native build when the `clean target
+  # is invoked. This doesn't work.
+#   add_custom_command(TARGET clean
+#     COMMAND ${CMAKE_BUILD_TOOL} -C ${CX_NATIVE_TG_DIR}/utils/TableGen clean
+#     POST_BUILD
+#     COMMENT "Cleaning native TableGen...")
 endif()