From fae59423190c384f6f76409381f5e79ee9de2af2 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 17 Jul 2015 16:37:41 -0700
Subject: [PATCH] Add the ability to build without clang

Also, tell Travis to build without clang because clang seems to crash on
Travis.
---
 sky/tools/gn    | 5 ++++-
 travis/build.sh | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sky/tools/gn b/sky/tools/gn
index 1fe6328f35b75..8a2c98c399faa 100755
--- a/sky/tools/gn
+++ b/sky/tools/gn
@@ -29,7 +29,7 @@ def to_gn_args(args):
     gn_args = {}
 
     gn_args["is_debug"] = args.debug
-    gn_args["is_clang"] = args.target_os not in ['android']
+    gn_args["is_clang"] = args.clang and args.target_os not in ['android']
 
     if args.target_os == 'android':
         gn_args["target_os"] = "android"
@@ -79,6 +79,9 @@ def main():
   parser.add_argument('--goma', default=True, action='store_true')
   parser.add_argument('--no-goma', dest='goma', action='store_false')
 
+  parser.add_argument('--clang', default=True, action='store_true')
+  parser.add_argument('--no-clang', dest='clang', action='store_false')
+
   args = parser.parse_args()
 
   command = ['gn', 'gen', '--check']
diff --git a/travis/build.sh b/travis/build.sh
index 329db0bb6ee92..e546d52860a25 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -2,6 +2,6 @@
 set -ex
 
 # Linux Debug
-./sky/tools/gn --debug
+./sky/tools/gn --debug --no-clang
 ninja -j 8 -C out/Debug
 ./sky/tools/test_sky --debug