Merge pull request #12440 from akien-mga/master

Travis: Simplify matrix, disable iphone and add X11 tools=no/clang

.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
-    - os: linux
+      compiler: clang
-      env: GODOT_TARGET=iphone
+    - env: GODOT_TARGET=x11 TOOLS=yes
-    - os: linux
+      os: linux
-      env: GODOT_TARGET=osx
+      compiler: gcc
-    - os: linux
+    - env: GODOT_TARGET=x11 TOOLS=no
-      env: GODOT_TARGET=android
+      os: linux
-    - os: osx
+      compiler: clang
-      env: GODOT_TARGET=x11
+    #- env: GODOT_TARGET=windows TOOLS=yes
-    - os: osx
+    #  os: linux
-      env: GODOT_TARGET=windows
+    #  compiler: gcc
-    - compiler: gcc
+    - env: GODOT_TARGET=osx TOOLS=yes
-      env: GODOT_TARGET=iphone
+      os: osx
-    - compiler: gcc
+      compiler: clang
-      env: GODOT_TARGET=osx
+    #- env: GODOT_TARGET=android TOOLS=no
-    - compiler: clang
+    #  os: osx
-      env: GODOT_TARGET=android
+    #  compiler: clang
-    - compiler: clang
+    #- env: GODOT_TARGET=iphone TOOLS=no
-      env: GODOT_TARGET=windows
+    #  os: osx
-    - compiler: clang
+    #  compiler: clang
-      env: GODOT_TARGET=x11
 
 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

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"