diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-29 09:57:21 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-29 09:57:21 -0700 |
| commit | c1ad3214858f6e8a852b2346ad69947b26e43172 (patch) | |
| tree | d5fc6a4e05d3c20d2c0d0105939951faa8d3c761 /platform/linux | |
| parent | c86f558e9d608ac19ca5b26ea8f72e2dc43c07c0 (diff) | |
| download | qtlocation-mapboxgl-c1ad3214858f6e8a852b2346ad69947b26e43172.tar.gz | |
[linux] Build with GCC 5 (#4901)
* [linux] Build with GCC 5
* [build] -fabi-version=0 is the default for GCC 5
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/README.md | 6 | ||||
| -rwxr-xr-x | platform/linux/scripts/coveralls.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/linux/README.md b/platform/linux/README.md index 910edcb9a6..bb05284609 100644 --- a/platform/linux/README.md +++ b/platform/linux/README.md @@ -8,12 +8,12 @@ This process gives you a Linux desktop app built on a Linux host system. ### Build -Install GCC 4.9+ if you are running Ubuntu 14.04 or older. Alternatively, you can also use [Clang 3.5+](http://llvm.org/apt/). +Install GCC 5+ if you are running Ubuntu 14.04 or older. Alternatively, you can also use [Clang 3.5+](http://llvm.org/apt/). sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install gcc-4.9 g++-4.9 - export CXX=g++-4.9 + sudo apt-get install gcc-5 g++-5 + export CXX=g++-5 Ensure you have git and other build essentials: diff --git a/platform/linux/scripts/coveralls.sh b/platform/linux/scripts/coveralls.sh index 1d8d9f060a..8d5903de6c 100755 --- a/platform/linux/scripts/coveralls.sh +++ b/platform/linux/scripts/coveralls.sh @@ -12,7 +12,7 @@ mapbox_time "lcov_capture" \ --quiet \ --capture \ --no-external \ - --gcov-tool "gcov-4.9" \ + --gcov-tool "gcov-5" \ --directory "src/mbgl" \ --directory "platform" \ --directory "include/mbgl" \ |