From d440a3c21d25aa9f2a003523a3909bf7fd5bb543 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jul 2015 14:32:04 +0800
Subject: [PATCH] Do not force using clang

---
 brightray/brightray.gypi | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index a14cc134319d..ec599c475dd0 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -3,9 +3,6 @@
     'vendor/download/libchromiumcontent/filenames.gypi',
   ],
   'variables': {
-    # Build with clang on Linux and Mac.
-    'clang%': 1,
-
     'libchromiumcontent_src_dir': '<(libchromiumcontent_root_dir)/src',
     'libchromiumcontent_component%': 1,
     'conditions': [
@@ -326,41 +323,4 @@
       }],
     ],  # target_conditions
   },  # target_defaults
-  'conditions': [
-    ['clang', {
-      'make_global_settings': [
-        ['CC', '/usr/bin/clang'],
-        ['CXX', '/usr/bin/clang++'],
-        ['LINK', '$(CXX)'],
-        ['CC.host', '$(CC)'],
-        ['CXX.host', '$(CXX)'],
-        ['LINK.host', '$(LINK)'],
-      ],
-      'target_defaults': {
-        'cflags_cc': [
-          '-std=c++11',
-        ],
-        'xcode_settings': {
-          'CC': '/usr/bin/clang',
-          'LDPLUSPLUS': '/usr/bin/clang++',
-          'OTHER_CFLAGS': [
-            '-fcolor-diagnostics',
-          ],
-
-          'GCC_C_LANGUAGE_STANDARD': 'c99',  # -std=c99
-          'CLANG_CXX_LIBRARY': 'libc++',  # -stdlib=libc++
-          'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
-        },
-        'target_conditions': [
-          ['_type in ["executable", "shared_library"]', {
-            'xcode_settings': {
-              # On some machines setting CLANG_CXX_LIBRARY doesn't work for
-              # linker.
-              'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
-            },
-          }],
-        ],
-      },
-    }],  # clang
-  ],
 }