From aad01f1f22641351769df5cfc8def9fbebf7789a Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:10:56 +0800 Subject: [PATCH] fix arm build --- .gitea/workflows/linux-aarch64-gcc.yml | 4 +++- .gitea/workflows/linux-arm-gcc.yml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/linux-aarch64-gcc.yml b/.gitea/workflows/linux-aarch64-gcc.yml index 5be692a..217f518 100644 --- a/.gitea/workflows/linux-aarch64-gcc.yml +++ b/.gitea/workflows/linux-aarch64-gcc.yml @@ -76,4 +76,6 @@ jobs: export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH cd build ln -sf /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1 - TESTS_EXECUTABLE_LOADER=qemu-aarch64 TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/aarch64-linux-gnu" ctest --output-on-failure -j $(nproc) + export LD_LIBRARY_PATH=/usr/aarch64-linux-gnu + qemu-aarch64 ctest --output-on-failure -j$(nproc) + # TESTS_EXECUTABLE_LOADER=qemu-aarch64 TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/aarch64-linux-gnu" ctest --output-on-failure -j $(nproc) diff --git a/.gitea/workflows/linux-arm-gcc.yml b/.gitea/workflows/linux-arm-gcc.yml index 0f47053..538e375 100644 --- a/.gitea/workflows/linux-arm-gcc.yml +++ b/.gitea/workflows/linux-arm-gcc.yml @@ -81,7 +81,9 @@ jobs: run: | export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH cd build - TESTS_EXECUTABLE_LOADER=qemu-arm TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/arm-linux-gnueabi" ctest --output-on-failure -j $(nproc) + export LD_LIBRARY_PATH=/usr/arm-linux-gnueabi/lib + qemu-arm ctest --output-on-failure -j$(nproc) + # TESTS_EXECUTABLE_LOADER=qemu-arm TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/arm-linux-gnueabi" ctest --output-on-failure -j $(nproc) linux-gcc-armhf: runs-on: ubuntu-20.04 steps: @@ -137,4 +139,6 @@ jobs: export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH cd build ln -sf /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3 - TESTS_EXECUTABLE_LOADER=qemu-arm TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/arm-linux-gnueabihf" ctest --output-on-failure -j $(nproc) + export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib + qemu-arm ctest --output-on-failure -j$(nproc) + # TESTS_EXECUTABLE_LOADER=qemu-arm TESTS_EXECUTABLE_LOADER_ARGUMENTS="-L;/usr/arm-linux-gnueabihf" ctest --output-on-failure -j $(nproc)