diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-31 12:17:31 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-31 12:17:31 +0100 |
| commit | 5f6d5716b86e21fe34b4878dd4c12bcf59ac8734 (patch) | |
| tree | ee5dee4c31d4951b1bd0b3827abc2c85daa4a979 | |
| parent | ad1c781d9f20082620aaf27f69ccbd829991017e (diff) | |
| download | ATCD-5f6d5716b86e21fe34b4878dd4c12bcf59ac8734.tar.gz | |
Use CC and CXX instead of COMPILER which only set CXX
* .travis.yml:
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index ad2e5813c9d..3fbe3101a2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ env: - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH - - COMPILER=g++-8 + - CXX=g++-8 + - CC=gcc-8 matrix: include: @@ -36,7 +37,7 @@ matrix: - libxerces-c-dev - libssl-dev - clang-7 - env: COMPILER=clang++-7 VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=clang++-7 CC=clang-7 VERSIONED=1 TAO=1 ACETESTS=1 - compiler: clang addons: apt: @@ -47,7 +48,7 @@ matrix: - libxerces-c-dev - libssl-dev - clang-6.0 - env: COMPILER=clang++-6.0 VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=clang++-6.0 CC=clang-6.0 VERSIONED=1 TAO=1 ACETESTS=1 - compiler: clang addons: apt: @@ -58,7 +59,7 @@ matrix: - libxerces-c-dev - libssl-dev - clang-5.0 - env: COMPILER=clang++-5.0 VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=clang++-5.0 CC=clang-5.0 VERSIONED=1 TAO=1 ACETESTS=1 - compiler: gcc addons: apt: @@ -68,7 +69,7 @@ matrix: - libxerces-c-dev - libssl-dev - g++-7 - env: COMPILER=g++-7 VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=g++-7 CC=gcc-7 VERSIONED=1 TAO=1 ACETESTS=1 - compiler: gcc addons: apt: @@ -78,9 +79,9 @@ matrix: - libxerces-c-dev - libssl-dev - g++-6 - env: COMPILER=g++-6 VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=g++-6 CC=gcc-6 VERSIONED=1 TAO=1 ACETESTS=1 - os: osx - env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 + env: CXX=clang++ VERSIONED=1 TAO=1 ACETESTS=1 addons: apt: @@ -135,7 +136,6 @@ before_script: - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h - cat $ACE_ROOT/include/makeinclude/platform_macros.GNU - - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi script: - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi |