epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #3 from mark0n/improve-compiler-detection

Browse Source 
So far compilers needed to be specified twice (as usual with Travis in compiler as well as in our own CMPLR environment variable). This change allows our scripts to use the compiler specified with Travis (no need to populate CMPLR anymore).
This commit is contained in:
Ralph Lange
2019-06-02 16:25:03 +02:00
parent 377d8d858e 833e23f9e6
commit 1749f82a66
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml.example-full
View File

@@ -34,12 +34,12 @@ matrix:
- env: BASE_BRANCH=7.0
- env: BASE_BRANCH=7.0 CMPLR=clang
- env: BASE_BRANCH=7.0
compiler: clang
- env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
- env: BASE_BRANCH=7.0 CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11"
- env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
compiler: clang
# Cross-compilation to Windows using MinGW and WINE
@@ -58,12 +58,12 @@ matrix:
# Other gcc versions (adding as an extra package)
- env: BASE_BRANCH=7.0 CMPLR=gcc-6
- env: BASE_BRANCH=7.0
dist: xenial
compiler: gcc-6
addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
- env: BASE_BRANCH=7.0 CMPLR=gcc-7
- env: BASE_BRANCH=7.0
dist: xenial
compiler: gcc-7
addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }