From c76c5152c2928d4a0d4ce663c2a3b2cfd79b7f6c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 17:59:19 -0400
Subject: [PATCH] travis-ci: fixup CFLAGS env and disable xcode6.3, it is
 really broken

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f46c307..5b414f97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,9 +73,9 @@ matrix:
           osx_image: beta-xcode6.2
           compiler: gcc
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-        - os: osx
-          osx_image: beta-xcode6.3
-          #
+#        - os: osx
+#          osx_image: beta-xcode6.3
+#          #
         - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
@@ -108,12 +108,11 @@ addons:
     - p7zip-full
 
 before_script:
-  - if $_CC --version 2>/dev/null; then export CC=$_CC; fi;
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
   - cd build
-  - export CFLAGS=-Wall -W -Werror
+  - export CFLAGS="-Wall -W -Werror"
   - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install: