[PATCH] D40229: [cmake] Remove redundant call to cmake when building host tools.

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL319582: [cmake] Revert (rL319574): Resubmit Remove redundant call to cmake when… (authored by dhinton).

Changed prior to commit:
  https://reviews.llvm.org/D40229?vs=125187&id=125196#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D40229

Files:
  llvm/trunk/cmake/modules/CrossCompile.cmake


Index: llvm/trunk/cmake/modules/CrossCompile.cmake
===================================================================
--- llvm/trunk/cmake/modules/CrossCompile.cmake
+++ llvm/trunk/cmake/modules/CrossCompile.cmake
@@ -12,17 +12,6 @@
         CACHE STRING "Toolchain file for ${target_name}")
   endif()
 
-  if (buildtype)
-    set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}")
-  endif()
-  if (LLVM_USE_LINKER AND NOT CMAKE_CROSSCOMPILING)
-    set(linker_flag "-DLLVM_USE_LINKER=${LLVM_USE_LINKER}")
-  endif()
-  if (LLVM_EXTERNAL_CLANG_SOURCE_DIR)
-    # Propagate LLVM_EXTERNAL_CLANG_SOURCE_DIR so that clang-tblgen can be built
-    set(external_clang_dir "-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${LLVM_EXTERNAL_CLANG_SOURCE_DIR}")
-  endif()
-
   add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${LLVM_${target_name}_BUILD}
     COMMENT "Creating ${LLVM_${target_name}_BUILD}...")
@@ -34,15 +23,41 @@
     COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
         ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
         -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
-        -DLLVM_TARGETS_TO_BUILD=Native
-        ${build_type_flags} ${linker_flag} ${external_clang_dir}
     WORKING_DIRECTORY ${LLVM_${target_name}_BUILD}
     DEPENDS CREATE_LLVM_${target_name}
     COMMENT "Configuring ${target_name} LLVM...")
 
   add_custom_target(CONFIGURE_LLVM_${target_name}
                     DEPENDS ${LLVM_${target_name}_BUILD}/CMakeCache.txt)
 
+  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+                                      ${LLVM_${target_name}_BUILD})
+
+  if(NOT IS_DIRECTORY ${LLVM_${target_name}_BUILD})
+
+    message(STATUS "Configuring ${target_name} build...")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
+      ${LLVM_${target_name}_BUILD} )
+
+    message(STATUS "Configuring ${target_name} targets...")
+    if (buildtype)
+      set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}")
+    endif()
+    if (LLVM_USE_LINKER AND NOT CMAKE_CROSSCOMPILING)
+      set(linker_flag "-DLLVM_USE_LINKER=${LLVM_USE_LINKER}")
+    endif()
+    if (LLVM_EXTERNAL_CLANG_SOURCE_DIR)
+      # Propagate LLVM_EXTERNAL_CLANG_SOURCE_DIR so that clang-tblgen can be built
+      set(external_clang_dir "-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${LLVM_EXTERNAL_CLANG_SOURCE_DIR}")
+    endif()
+    execute_process(COMMAND ${CMAKE_COMMAND} ${build_type_flags}
+        -G "${CMAKE_GENERATOR}" -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}
+        ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
+        -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
+        ${external_clang_dir} ${linker_flag}
+      WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} )
+  endif(NOT IS_DIRECTORY ${LLVM_${target_name}_BUILD})
+
 endfunction()
 
 function(llvm_create_cross_target target_name sysroot)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40229.125196.patch
Type: text/x-patch
Size: 2896 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171201/f49a5af4/attachment.bin>