diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-27 19:18:22 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-27 19:56:37 +0200 |
| commit | 37f1bb3298150be7abe5c8bc0707c49372dd82a2 (patch) | |
| tree | 756255e15c7e0ce92e680bd481ccc3b23b3d5b16 /platform | |
| parent | 6fc2fffb459e8c6deb87fe795e8103747f09b077 (diff) | |
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
Travis always has massive backlog of macOS builds, so we can't rely on them
too much.
The iphone build was mostly useful to spot tools=no or target=release_debug
issues, so replacing it by an appropriate X11 build.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/x11/detect.py | 4 |
1 files changed, 4 insertions, 0 deletions
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" |