diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml index ca813870..d9d16153 100644 --- a/.github/workflows/linux_ci.yml +++ b/.github/workflows/linux_ci.yml @@ -8,44 +8,45 @@ on: jobs: - # compile with oldest gcc4.9 which supports (most of)C++14 - build-gcc49: + # Disable gcc4.9 and gcc5 since its too obsolete and failed to do apt-get + ## compile with oldest gcc4.9 which supports (most of)C++14 + #build-gcc49: - runs-on: ubuntu-latest - name: Build with gcc 4.9 - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: CmakeAndBuild - run: | - sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main' - sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe' - sudo apt-get update - sudo apt-get install -y build-essential - sudo apt-get install -y gcc-4.9 g++-4.9 gcc-4.9-multilib - ./scripts/bootstrap-gcc-49.sh - cd build-gcc49 - make VERBOSE=1 + # runs-on: ubuntu-latest + # name: Build with gcc 4.9 + # steps: + # - name: Checkout + # uses: actions/checkout@v1 + # - name: CmakeAndBuild + # run: | + # sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main' + # sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe' + # sudo apt-get update + # sudo apt-get install -y build-essential + # sudo apt-get install -y gcc-4.9 g++-4.9 gcc-4.9-multilib + # ./scripts/bootstrap-gcc-49.sh + # cd build-gcc49 + # make VERBOSE=1 - # compile with older gcc5 - build-gcc5: + ## compile with older gcc5 + #build-gcc5: - runs-on: ubuntu-latest - name: Build with gcc 5 + # runs-on: ubuntu-latest + # name: Build with gcc 5 - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: CmakeAndBuild - run: | - sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main' - sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe' - sudo apt-get update - sudo apt-get install -y build-essential - sudo apt-get install -y gcc-5 g++-5 - ./scripts/bootstrap-gcc-5.sh - cd build-gcc5 - make VERBOSE=1 + # steps: + # - name: Checkout + # uses: actions/checkout@v1 + # - name: CmakeAndBuild + # run: | + # sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main' + # sudo apt-add-repository -y 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe' + # sudo apt-get update + # sudo apt-get install -y build-essential + # sudo apt-get install -y gcc-5 g++-5 + # ./scripts/bootstrap-gcc-5.sh + # cd build-gcc5 + # make VERBOSE=1 # Cross-compile for aarch64 linux target build-cross-aarch64: @@ -60,7 +61,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y build-essential - sudo apt-get install -y gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu ./scripts/bootstrap-gcc-aarch64-cross.sh cd build-cross make VERBOSE=1 diff --git a/cmake/aarch64-linux-gnu.toolchain b/cmake/aarch64-linux-gnu.toolchain index b4c878a6..cdcdaf25 100644 --- a/cmake/aarch64-linux-gnu.toolchain +++ b/cmake/aarch64-linux-gnu.toolchain @@ -5,8 +5,8 @@ set(CMAKE_C_COMPILER_TARGET aarch64-linux-gnu) set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu/) # Sync with GitHub Actions config -set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc-8) -set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++-8) +set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) +set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)