Index: cmake/modules/TableGen.cmake =================================================================== --- cmake/modules/TableGen.cmake +++ cmake/modules/TableGen.cmake @@ -146,7 +146,7 @@ set(${project}_TABLEGEN_EXE ${${project}_TABLEGEN} PARENT_SCOPE) set(${project}_TABLEGEN_TARGET ${${project}_TABLEGEN} PARENT_SCOPE) - if(LLVM_USE_HOST_TOOLS) + if(LLVM_USE_HOST_TOOLS AND NOT HAVE_NATIVE_${project}_TABLEGEN) if( ${${project}_TABLEGEN} STREQUAL "${target}" ) if (NOT CMAKE_CONFIGURATION_TYPES) set(${project}_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/bin/${target}") Index: tools/llvm-config/CMakeLists.txt =================================================================== --- tools/llvm-config/CMakeLists.txt +++ tools/llvm-config/CMakeLists.txt @@ -64,7 +64,7 @@ # Add the dependency on the generation step. add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABLES_OBJPATH}) -if(CMAKE_CROSSCOMPILING) +if(CMAKE_CROSSCOMPILING AND NOT HAVE_NATIVE_LLVM_CONFIG) set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config") set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE)