Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[build] Deprecated GCC 4.9 and set the minimum to GCC 5
Browse files Browse the repository at this point in the history
  • Loading branch information
tmpsantos committed Mar 23, 2020
1 parent 463876a commit 3e173e1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ workflows:
metrics: true
style_tests: true
- build-template:
name: linux-gcc4.9-release
name: linux-gcc5-release
executor_name: ubuntu-disco
target_is_linux: true
requires:
- linux-gcc8-release
config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5'
build_params: '--target mbgl-glfw'
test_params: '-N -Q'
- build-template:
Expand Down
4 changes: 1 addition & 3 deletions scripts/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ RUN set -eu \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F \
&& add-apt-repository "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" \
&& add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe" \
&& apt-get install -y \
g++-4.9 \
g++-5
&& apt-get install -y g++-5

# Install Android NDK
RUN set -eu \
Expand Down

0 comments on commit 3e173e1

Please sign in to comment.