Skip to content

Commit 52ea818

Browse files
committed
Addition updates
1 parent 1d4e087 commit 52ea818

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,6 @@ jobs:
404404
continue-on-error: true
405405
container:
406406
image: dockcross/linux-armv7:latest
407-
env:
408-
CC: /usr/bin/arm-linux-gnueabihf-gcc
409-
CXX: /usr/bin/arm-linux-gnueabihf-g++
410-
ARMV7_SYSROOT: /usr/arm-linux-gnueabihf
411-
CMAKE_CROSSCOMPILING_EMULATOR: /usr/bin/qemu-arm;-L;/usr/arm-linux-gnueabihf
412407
steps:
413408
- name: Checkout
414409
uses: actions/checkout@v4
@@ -418,11 +413,8 @@ jobs:
418413
cmake -S . -B out/build/armv7-cross -G Ninja \
419414
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
420415
-DCMAKE_CXX_STANDARD=20 \
421-
-DCMAKE_SYSTEM_NAME=Linux \
422-
-DCMAKE_C_COMPILER="${CC}" \
423-
-DCMAKE_CXX_COMPILER="${CXX}" \
424-
-DCMAKE_CROSSCOMPILING_EMULATOR="${CMAKE_CROSSCOMPILING_EMULATOR}" \
425-
-DCMAKE_SYSROOT="${ARMV7_SYSROOT}" \
416+
-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE}" \
417+
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
426418
-DSNAP_TEST_GROUPED=ON
427419
cmake --build out/build/armv7-cross --parallel
428420

0 commit comments

Comments
 (0)