diff --git a/.github/workflows-in/arch.ys b/.github/workflows-in/arch.ys index 6e6aff8f..6c73b1ff 100644 --- a/.github/workflows-in/arch.ys +++ b/.github/workflows-in/arch.ys @@ -17,7 +17,7 @@ jobs: - {arch: armv6 , tc: arm-linux-gnueabi, flags: -march=armv6+fp} - {arch: armv5 , tc: arm-linux-gnueabi, flags: -march=armv5te+fp} - {arch: armv4 , tc: arm-linux-gnueabi, flags: -march=armv4} - - {arch: loongarch64, tc: 14-loongarch64-linux-gnu} + - {arch: loongarch64, tc: loongarch64-linux-gnu, version: 14-} - {arch: mips , tc: mips-linux-gnu} - {arch: mipsel , tc: mipsel-linux-gnu} - {arch: mips64 , tc: mips64-linux-gnuabi64} @@ -35,14 +35,14 @@ jobs: run: | sudo apt-get update sudo apt-get install -y \ - gcc-${{matrix.tc}} \ - g++-${{matrix.tc}} \ + gcc-${{matrix.version}}${{matrix.tc}} \ + g++-${{matrix.version}}${{matrix.tc}} \ qemu-user-static - name: info run: | - ${{matrix.tc}}-g++ --version - ${{matrix.tc}}-g++ -dM -E - ) is the more general syntax for any expr @@ -298,7 +298,8 @@ defn run-manual-with-flags(cxx cc buildtype flags=""):: -DC4CORE_VALGRIND=${{matrix.vg}} \ -DC4CORE_DEV=ON \ -DC4CORE_BUILD_BENCHMARKS=OFF \ - -DC4CORE_DBG=OFF + -DC4CORE_DBG=OFF \ + $cmkflags - name:: "build $buildtype ::: $flags" run:: | cmake --build build/$buildtype --target c4core-test-build --parallel --verbose @@ -307,7 +308,7 @@ defn run-manual-with-flags(cxx cc buildtype flags=""):: cmake --build build/$buildtype --target c4core-test-run -defn run-vs-manual-with-flags(gen arch buildtype shared flags=""):: +defn run-vs-manual-with-flags(gen arch buildtype shared flags="" cmkflags=""):: - name:: "---------------------------------------------------------" run:: | echo "$buildtype ::: $flags shared=$shared" @@ -329,7 +330,8 @@ defn run-vs-manual-with-flags(gen arch buildtype shared flags=""):: -DC4CORE_BUILD_TESTS=ON \ -DC4CORE_DEV=ON \ -DC4CORE_BUILD_BENCHMARKS=OFF \ - -DC4CORE_DBG=OFF + -DC4CORE_DBG=OFF \ + $cmkflags - name:: "build $buildtype ::: $flags shared=$shared" run:: | cmake --build build/$buildtype --target c4core-test-build --parallel --verbose diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml index d05bbb68..5e5b05f0 100644 --- a/.github/workflows/arch.yml +++ b/.github/workflows/arch.yml @@ -43,7 +43,8 @@ jobs: tc: arm-linux-gnueabi flags: -march=armv4 - arch: loongarch64 - tc: 14-loongarch64-linux-gnu + tc: loongarch64-linux-gnu + version: 14- - arch: mips tc: mips-linux-gnu - arch: mipsel @@ -74,14 +75,14 @@ jobs: run: | sudo apt-get update sudo apt-get install -y \ - gcc-${{matrix.tc}} \ - g++-${{matrix.tc}} \ + gcc-${{matrix.version}}${{matrix.tc}} \ + g++-${{matrix.version}}${{matrix.tc}} \ qemu-user-static - name: info run: | - ${{matrix.tc}}-g++ --version - ${{matrix.tc}}-g++ -dM -E -