diff options
| author | Rémi Verschelde | 2017-10-27 20:33:39 +0200 |
|---|---|---|
| committer | GitHub | 2017-10-27 20:33:39 +0200 |
| commit | e00a9eeb98173ff81c18fc0237dceafd972b9508 (patch) | |
| tree | e1d74b9c3aba53aeef819732a2272894e87c3b49 /platform | |
| parent | 568e9056043dd57cc0fbb937bf7c963530b35452 (diff) | |
| parent | 37f1bb3298150be7abe5c8bc0707c49372dd82a2 (diff) | |
| download | godot-e00a9eeb98173ff81c18fc0237dceafd972b9508.tar.gz godot-e00a9eeb98173ff81c18fc0237dceafd972b9508.tar.zst godot-e00a9eeb98173ff81c18fc0237dceafd972b9508.zip | |
Merge pull request #12440 from akien-mga/master
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
Diffstat (limited to '')
| -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 8c68c9ffd..56bc1d4c5 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" |