File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -394,22 +394,24 @@ matrix:
394
394
- clang-3.8
395
395
.endif
396
396
.if defined (project.travis_shadow_gcc) & !(project.travis_shadow_gcc ?= 0)
397
+ . if !(defined(use_cxx_gcc_4_9)) | !(use_cxx_gcc_4_9 ?= 1)
397
398
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
398
399
os: linux
399
- .if (project.travis_dist ?<> "")
400
+ . if (project.travis_dist ?<> "")
400
401
dist: $(project.travis_dist)
401
- .endif
402
+ . endif
402
403
addons:
403
404
apt:
404
405
sources:
405
406
- ubuntu-toolchain-r-test
406
- .if (pkg_src_zeromq_dist ?<> "")
407
+ . if (pkg_src_zeromq_dist ?<> "")
407
408
- *$(pkg_src_zeromq_dist)
408
- .endif
409
+ . endif
409
410
packages:
410
411
- *pkg_deps_common
411
412
- g++-4.9
412
413
- gcc-4.9
414
+ . endif
413
415
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
414
416
os: linux
415
417
.if (project.travis_dist ?<> "")
@@ -500,7 +502,9 @@ matrix:
500
502
. endif
501
503
. if project.travis_shadow_gcc ?= 2
502
504
. echo "TRAVIS: Shadow GCC versions: allow-fail: true"
505
+ . if !(use_cxx_gcc_4_9 ?= 1)
503
506
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
507
+ . endif
504
508
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
505
509
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
506
510
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
You can’t perform that action at this time.
0 commit comments