Skip to content

Fix one-call cross-build #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Fix one-call cross-build #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
3 changes: 1 addition & 2 deletions cl_headers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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}"
)
Expand Down
12 changes: 11 additions & 1 deletion linux_linker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)