From 37f1bb3298150be7abe5c8bc0707c49372dd82a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 27 Oct 2017 19:18:22 +0200 Subject: 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. --- platform/x11/detect.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'platform/x11/detect.py') 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" -- cgit v1.2.3