Skip to content

Commit b170780

Browse files
authored
Use gcc15 for linux builds (#57)
1 parent 6851161 commit b170780

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,16 @@ jobs:
4040
- uses: actions/checkout@v3.3.0
4141
with:
4242
submodules: recursive
43+
44+
- name: Setup GCC 15
45+
uses: egor-tensin/setup-gcc@v2
46+
with:
47+
version: '15'
4348

4449
- name: Build
4550
working-directory: ${{github.workspace}}/build
4651
env:
47-
CXX: g++-13
52+
CXX: g++-15
4853
run: |
4954
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON
5055
cmake --build . --config $BUILD_TYPE -j4

.github/workflows/release.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,17 @@ jobs:
4141
- uses: actions/checkout@v3.3.0
4242
with:
4343
submodules: recursive
44+
45+
- name: Setup GCC 15
46+
uses: egor-tensin/setup-gcc@v2
47+
with:
48+
version: '15'
4449

4550
- name: Build
4651
working-directory: ${{github.workspace}}/build
4752
env:
48-
CXX: clang++
49-
CXXFLAGS: "-Wall -O3 -march=${{ matrix.native_arch }}"
53+
CXX: g++-15
54+
CXXFLAGS: "-Wall -O3 -march=${{ matrix.native_arch }} -static-libstdc++ -static-libgcc"
5055
run: |
5156
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON
5257
cmake --build . --config $BUILD_TYPE -j4
@@ -77,7 +82,7 @@ jobs:
7782
native_arch: [rpi4, rpi5]
7883
runs-on: ubuntu-latest
7984
container:
80-
image: ghcr.io/tttapa/docker-arm-cross-toolchain:aarch64-rpi3-linux-gnu-gcc12
85+
image: ghcr.io/tttapa/docker-arm-cross-toolchain:aarch64-rpi3-linux-gnu-gcc15
8186
env:
8287
ARCHIVE_NAME: ModelTest_${{ matrix.native_arch }}.tgz
8388
steps:
@@ -87,6 +92,8 @@ jobs:
8792

8893
- name: Build
8994
working-directory: ${{github.workspace}}/build
95+
env:
96+
CXXFLAGS: "-static-libstdc++ -static-libgcc"
9097
run: |
9198
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON -DCMAKE_TOOLCHAIN_FILE=/home/develop/opt/x-tools/aarch64-rpi3-linux-gnu/aarch64-${{ matrix.native_arch }}-linux-gnu.toolchain.cmake
9299
cmake --build . --config $BUILD_TYPE -j4

0 commit comments

Comments
 (0)