Skip to content

Commit c05fce2

Browse files
committed
zproject_travis.gsl : do not shadow-compile with gcc-5 in "xenial" where it is default
1 parent 408d071 commit c05fce2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

zproject_travis.gsl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,22 +412,24 @@ matrix:
412412
- g++-4.9
413413
- gcc-4.9
414414
. endif
415+
.if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
415416
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
416417
os: linux
417-
.if (project.travis_dist ?<> "")
418+
. if (project.travis_dist ?<> "")
418419
dist: $(project.travis_dist)
419-
.endif
420+
. endif
420421
addons:
421422
apt:
422423
sources:
423424
- ubuntu-toolchain-r-test
424-
.if (pkg_src_zeromq_dist ?<> "")
425+
. if (pkg_src_zeromq_dist ?<> "")
425426
- *$(pkg_src_zeromq_dist)
426-
.endif
427+
. endif
427428
packages:
428429
- *pkg_deps_common
429430
- g++-5
430431
- gcc-5
432+
.endif
431433
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
432434
os: linux
433435
.if (project.travis_dist ?<> "")
@@ -505,7 +507,9 @@ matrix:
505507
. if !(use_cxx_gcc_4_9 ?= 1)
506508
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
507509
. endif
510+
. if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
508511
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
512+
. endif
509513
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
510514
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
511515
. endif

0 commit comments

Comments
 (0)