Skip to content

Commit 3cde611

Browse files
committed
zproject_travis.gsl : in MATRIX_EVAL export CC CXX that we set
1 parent 9d37546 commit 3cde611

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

zproject_travis.gsl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ matrix:
335335
# Shadow-compilation setups below inspired by https://docs.travis-ci.com/user/languages/cpp/
336336
.endif
337337
. if defined (project.travis_shadow_clang) & !(project.travis_shadow_clang ?= 0)
338-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
338+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && export CC CXX"
339339
os: linux
340340
. if (project.travis_dist ?<> "")
341341
dist: $(project.travis_dist)
@@ -356,7 +356,7 @@ matrix:
356356
packages:
357357
- *pkg_deps_common
358358
- clang-5.0
359-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
359+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0 && export CC CXX"
360360
os: linux
361361
. if (project.travis_dist ?<> "")
362362
dist: $(project.travis_dist)
@@ -377,7 +377,7 @@ matrix:
377377
packages:
378378
- *pkg_deps_common
379379
- clang-4.0
380-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
380+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9 && export CC CXX"
381381
os: linux
382382
. if (project.travis_dist ?<> "")
383383
dist: $(project.travis_dist)
@@ -398,7 +398,7 @@ matrix:
398398
packages:
399399
- *pkg_deps_common
400400
- clang-3.9
401-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
401+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8 && export CC CXX"
402402
os: linux
403403
. if (project.travis_dist ?<> "")
404404
dist: $(project.travis_dist)
@@ -422,7 +422,7 @@ matrix:
422422
.endif
423423
.if defined (project.travis_shadow_gcc) & !(project.travis_shadow_gcc ?= 0)
424424
. if !(defined(use_cxx_gcc_4_9)) | !(use_cxx_gcc_4_9 ?= 1)
425-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
425+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && export CC CXX"
426426
os: linux
427427
. if (project.travis_dist ?<> "")
428428
dist: $(project.travis_dist)
@@ -440,7 +440,7 @@ matrix:
440440
- gcc-4.9
441441
. endif
442442
. if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
443-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
443+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5 && export CC CXX"
444444
os: linux
445445
. if (project.travis_dist ?<> "")
446446
dist: $(project.travis_dist)
@@ -457,7 +457,7 @@ matrix:
457457
- g++-5
458458
- gcc-5
459459
. endif
460-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
460+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 && export CC CXX"
461461
os: linux
462462
. if (project.travis_dist ?<> "")
463463
dist: $(project.travis_dist)
@@ -473,7 +473,7 @@ matrix:
473473
- *pkg_deps_common
474474
- g++-6
475475
- gcc-6
476-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
476+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && export CC CXX"
477477
os: linux
478478
. if (project.travis_dist ?<> "")
479479
dist: $(project.travis_dist)
@@ -532,20 +532,20 @@ matrix:
532532
. if project.travis_shadow_gcc ?= 2
533533
. echo "TRAVIS: Shadow GCC versions: allow-fail: true"
534534
. if !(use_cxx_gcc_4_9 ?= 1)
535-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
535+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && export CC CXX"
536536
. endif
537537
. if !defined(project.travis_dist) | (project.travis_dist ?<> "xenial")
538-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
538+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-5 && CXX=g++-5 && export CC CXX"
539539
. endif
540-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
541-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
540+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 && export CC CXX"
541+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && export CC CXX"
542542
. endif
543543
. if project.travis_shadow_clang ?= 2
544544
. echo "TRAVIS: Shadow CLANG versions: allow-fail: true"
545-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
546-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
547-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
548-
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
545+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && export CC CXX"
546+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0 && export CC CXX"
547+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9 && export CC CXX"
548+
- env: BUILD_TYPE=default-Werror MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8 && export CC CXX"
549549
. endif
550550
. if project.travis_clangformat_allow_failures ?= 1
551551
. echo "TRAVIS: CLANG-FORMAT: allow-fail: true"

0 commit comments

Comments
 (0)