From 13f816b4bb34344d262f72a3bb94b7ba1b7e5e96 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 Dec 2013 11:09:24 +0000
Subject: [PATCH 1/2] Add flag to disable clang under Linux.

---
 brightray/brightray.gyp  |  2 +-
 brightray/brightray.gypi | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index a4baef81f6f..9504a57786f 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -88,7 +88,7 @@
       ],
       'conditions': [
         ['OS=="linux"', {
-          'cflags': [
+          'cflags_cc': [
             '-fno-rtti',
           ],
           'link_settings': {
diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index e2deae347a8..27e13a6173e 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -8,6 +8,9 @@
     'mac_deployment_target%': '10.8',
     'mac_sdkroot%': 'macosx',
 
+    # Build with clang under Linux.
+    'linux_clang%': 1,
+
     'win_release_RuntimeLibrary%': '2', # /MD (nondebug DLL)
     'win_debug_RuntimeLibrary%': '3', # /MTd (debug DLL)
 
@@ -176,7 +179,6 @@
       }],
       ['OS=="linux"', {
         'cflags_cc': [
-          '-std=gnu++11',
           '-fno-rtti',
           '<!@(pkg-config --cflags gtk+-2.0)',
         ],
@@ -189,7 +191,7 @@
     ],
   },
   'conditions': [
-    ['OS=="linux"', {
+    ['OS=="linux" and linux_clang==1', {
       'make_global_settings': [
         ['CC', '/usr/bin/clang'],
         ['CXX', '/usr/bin/clang++'],
@@ -198,6 +200,11 @@
         ['CXX.host', '$(CXX)'],
         ['LINK.host', '$(LINK)'],
       ],
+      'target_defaults': {
+        'cflags_cc': [
+          '-std=gnu++11',
+        ],
+      },
     }],
     ['OS=="win"', {
       'target_defaults': {

From 167b2f5881b998ab0e9b0c696381aa39ee1f179f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 02:29:27 +0000
Subject: [PATCH 2/2] '-std=gnu++11' is also needed by g++.

---
 brightray/brightray.gypi | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index 27e13a6173e..daf5f2737cf 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -179,6 +179,7 @@
       }],
       ['OS=="linux"', {
         'cflags_cc': [
+          '-std=gnu++11',
           '-fno-rtti',
           '<!@(pkg-config --cflags gtk+-2.0)',
         ],
@@ -200,11 +201,6 @@
         ['CXX.host', '$(CXX)'],
         ['LINK.host', '$(LINK)'],
       ],
-      'target_defaults': {
-        'cflags_cc': [
-          '-std=gnu++11',
-        ],
-      },
     }],
     ['OS=="win"', {
       'target_defaults': {