diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-27 20:33:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 20:33:39 +0200 |
| commit | e00a9eeb98173ff81c18fc0237dceafd972b9508 (patch) | |
| tree | e1d74b9c3aba53aeef819732a2272894e87c3b49 | |
| parent | 568e9056043dd57cc0fbb937bf7c963530b35452 (diff) | |
| parent | 37f1bb3298150be7abe5c8bc0707c49372dd82a2 (diff) | |
Merge pull request #12440 from akien-mga/master
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
| -rw-r--r-- | .travis.yml | 58 | ||||
| -rw-r--r-- | platform/x11/detect.py | 4 |
2 files changed, 25 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index a2c3417412..409c870e79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,45 +6,29 @@ sudo: false cache: ccache -compiler: - - gcc - - clang - -os: - - linux - - osx - -env: - - GODOT_TARGET=iphone - - GODOT_TARGET=osx - - GODOT_TARGET=x11 - #- GODOT_TARGET=android - #- GODOT_TARGET=windows - matrix: include: - env: STATIC_CHECKS=yes - exclude: - - os: linux - env: GODOT_TARGET=iphone - - os: linux - env: GODOT_TARGET=osx - - os: linux - env: GODOT_TARGET=android - - os: osx - env: GODOT_TARGET=x11 - - os: osx - env: GODOT_TARGET=windows - - compiler: gcc - env: GODOT_TARGET=iphone - - compiler: gcc - env: GODOT_TARGET=osx - - compiler: clang - env: GODOT_TARGET=android - - compiler: clang - env: GODOT_TARGET=windows - - compiler: clang - env: GODOT_TARGET=x11 + os: linux + compiler: clang + - env: GODOT_TARGET=x11 TOOLS=yes + os: linux + compiler: gcc + - env: GODOT_TARGET=x11 TOOLS=no + os: linux + compiler: clang + #- env: GODOT_TARGET=windows TOOLS=yes + # os: linux + # compiler: gcc + - env: GODOT_TARGET=osx TOOLS=yes + os: osx + compiler: clang + #- env: GODOT_TARGET=android TOOLS=no + # os: osx + # compiler: clang + #- env: GODOT_TARGET=iphone TOOLS=no + # os: osx + # compiler: clang addons: apt: @@ -92,5 +76,5 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX; + scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no; fi diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 8c68c9ffd1..56bc1d4c59 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -101,6 +101,10 @@ def configure(env): ## Compiler configuration + if 'CXX' in env and 'clang' in env['CXX']: + # Convenience check to enforce the use_llvm overrides when CXX is clang(++) + env['use_llvm'] = True + if env['use_llvm']: if ('clang++' not in env['CXX']): env["CC"] = "clang" |