diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/llvm-config/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tools/llvmc2/driver/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index b5551bb132..9f1f2f2d31 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -63,8 +63,16 @@ set(LLVM_CONFIG_IN ${CMAKE_CURRENT_BINARY_DIR}/llvm-config.in) # set(LIBDEPS_TMP LibDeps.txt.tmp) # set(FINAL_LIBDEPS FinalLibDeps.txt) +if( CMAKE_CROSSCOMPILING ) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) +endif() + +if( NOT NM_PATH ) + message(FATAL_ERROR "`nm' was not found") +endif() + add_custom_command(OUTPUT ${LIBDEPS_TMP} - COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} > ${LIBDEPS_TMP} + COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} ${NM_PATH} > ${LIBDEPS_TMP} COMMENT "Regenerating ${LIBDEPS_TMP}") add_custom_command(OUTPUT ${LIBDEPS} diff --git a/tools/llvmc2/driver/CMakeLists.txt b/tools/llvmc2/driver/CMakeLists.txt index 538f8974a3..6a7a2a8f01 100644 --- a/tools/llvmc2/driver/CMakeLists.txt +++ b/tools/llvmc2/driver/CMakeLists.txt @@ -3,7 +3,7 @@ set(LLVM_REQUIRES_EH 1) macro(tgen ofn) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn} - COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn} + COMMAND ${LLVM_TABLEGEN} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn} DEPENDS tblgen ${LLVM_MAIN_INCLUDE_DIR}/llvm/CompilerDriver/Common.td |