diff options
author | Jere Leppänen <jere.leppanen@nokia.com> | 2022-08-26 19:39:10 +0300 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2022-09-09 10:24:07 +0300 |
commit | 93e26c043cd0b287736e4ac663514774611894b8 (patch) | |
tree | ae89158c7c5eeca40afba039edaa5d61a63243d6 /.github | |
parent | a6b26cb6f51a15e0ac6727910903a9c69adc4770 (diff) |
ci: fix g++ version in arm64 builds
When a non-default version of gcc is used, use the same version of
g++, so that LTO can be used also with statically linked c++ programs.
Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci-pipeline-arm64.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml index 00a786982..9d473a67a 100644 --- a/.github/workflows/ci-pipeline-arm64.yml +++ b/.github/workflows/ci-pipeline-arm64.yml @@ -60,12 +60,12 @@ jobs: strategy: fail-fast: false matrix: - cc: [gcc-10, gcc-11, gcc-12] + cc_ver: [10, 11, 12] conf: ['', '--enable-lto'] steps: - uses: AutoModality/action-clean@v1.1.0 - uses: actions/checkout@v2 - - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" + - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}" -e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh - name: Failure log if: ${{ failure() }} |