Virtualization
/
brotli
mirror of https://github.com/google/brotli
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #429 from google/fix-homebrew-gcc-6 

Fix integration build
This commit is contained in:
Eugene Kliuchnikov 2016-09-20 10:30:42 +02:00 committed by GitHub
parent 5ce9bf11b3 ea9c51e4ca
commit 56c890d5f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -138,10 +138,10 @@ matrix:
## all since we already test all these versions of GCC on Linux. ## all since we already test all these versions of GCC on Linux.
## We'll just test 4.4 and the most recent version. ## We'll just test 4.4 and the most recent version.
### ###
- os: osx
env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6
# - os: osx # - os: osx
# env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6
- os: osx
env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5
# - os: osx # - os: osx
# env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9 # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9
# - os: osx # - os: osx