From 52b4bf5a0ec5638df9bd6165422f258f073c9664 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 9 Oct 2024 20:19:53 -0700 Subject: [PATCH] Try to fix cross-compile build --- CMakeLists.txt | 5 ++++- Dockerfile | 1 + aarch64-toolchain.cmake | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b376c73..2c5327f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,9 +95,12 @@ target_compile_options(${PROJECT_NAME}-object PRIVATE -fno-exceptions -fvisibility=hidden) target_include_directories(${PROJECT_NAME}-object PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) +if(NOT LD_EXE) + set(LD_EXE ld) +endif() add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o - COMMAND ld -r $ -o + COMMAND ${LD_EXE} -r $ -o ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o DEPENDS $ COMMAND_EXPAND_LISTS) diff --git a/Dockerfile b/Dockerfile index 297c489..186bd75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN chmod -R 777 /tmp RUN apt-get update RUN apt-get upgrade -y RUN TZ=America/Los_Angeles DEBIAN_FRONTEND=noninteractive apt-get install -y \ + binutils-aarch64-linux-gnu \ build-essential \ ccache \ clang \ diff --git a/aarch64-toolchain.cmake b/aarch64-toolchain.cmake index ce4cb2c..ef9aaf4 100644 --- a/aarch64-toolchain.cmake +++ b/aarch64-toolchain.cmake @@ -5,3 +5,4 @@ set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++") set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu) set(CMAKE_CROSSCOMPILING_EMULATOR "qemu-aarch64;-L;/usr/aarch64-linux-gnu/") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64) +set(LD_EXE /usr/aarch64-linux-gnu/bin/ld)