From 447798893e7e381d5321f940d30710f72214c5af Mon Sep 17 00:00:00 2001 From: Kirill Zhavoronkov Date: Wed, 26 May 2021 19:02:16 +0300 Subject: [PATCH] Fix one-call cross-build --- CMakeLists.txt | 3 +-- cl_headers/CMakeLists.txt | 3 +-- linux_linker/CMakeLists.txt | 12 +++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2220091..4e1dff8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,8 +144,7 @@ endif(NOT USE_PREBUILT_LLVM) # set (COMPILE_OPTIONS_TD opencl_clang_options.td) set (COMPILE_OPTIONS_INC opencl_clang_options.inc) - -set(LLVM_TABLEGEN_EXE "llvm-tblgen") +find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}) set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) if(USE_PREBUILT_LLVM) set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt index 519d210a..baef2082 100644 --- a/cl_headers/CMakeLists.txt +++ b/cl_headers/CMakeLists.txt @@ -1,6 +1,5 @@ set(CL_HEADERS_LIB cl_headers) set(CLANG_COMMAND clang) -set(LINUX_RESOURCE_LINKER_COMMAND linux_resource_linker) function(copy_file SRC DST) add_custom_command( @@ -31,7 +30,7 @@ add_custom_target ( function(pack_to_obj SRC DST TAG) add_custom_command ( OUTPUT ${DST} - DEPENDS ${SRC} ${LINUX_RESOURCE_LINKER_COMMAND} + DEPENDS ${SRC} linux_resource_linker COMMAND ${LINUX_RESOURCE_LINKER_COMMAND} "${SRC}" "${DST}" "${TAG}" COMMENT "Packing ${SRC}" ) diff --git a/linux_linker/CMakeLists.txt b/linux_linker/CMakeLists.txt index 800e7098..aad5ffa4 100644 --- a/linux_linker/CMakeLists.txt +++ b/linux_linker/CMakeLists.txt @@ -1 +1,11 @@ -ADD_EXECUTABLE(linux_resource_linker linux_resource_linker) +add_executable(linux_resource_linker linux_resource_linker.cpp) + +if(LLVM_USE_HOST_TOOLS) + build_native_tool(linux_resource_linker LINUX_RESOURCE_LINKER_COMMAND) + add_custom_target(linux_resource_linker-host DEPENDS ${LINUX_RESOURCE_LINKER_COMMAND} ) + add_dependencies(linux_resource_linker linux_resource_linker-host) +else() + set(LINUX_RESOURCE_LINKER_COMMAND linux_resource_linker) +endif() + +set(LINUX_RESOURCE_LINKER_COMMAND ${LINUX_RESOURCE_LINKER_COMMAND} PARENT_SCOPE)