summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 18:46:26 +0000
committersdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 18:46:26 +0000
commitc80075419cd2031af00296b3558969052441a0c4 (patch)
tree5597f0850d164ad6c3c24e2baa5bd68508526f64 /build
parent0623016bce75074f517861c9be484ef85af04b87 (diff)
downloadchromium_src-c80075419cd2031af00296b3558969052441a0c4.zip
chromium_src-c80075419cd2031af00296b3558969052441a0c4.tar.gz
chromium_src-c80075419cd2031af00296b3558969052441a0c4.tar.bz2
Remove hack disabling goma when building using Xcode clang
The last version of goma (54) no longer mistake clang for gcc when it is accessed using the cc symlink in the path. BUG=315114 Review URL: https://codereview.chromium.org/183213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi
index f0201a8..2735ac8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4969,8 +4969,7 @@
# TODO(yyanagisawa): supports GENERATOR==make
# make generator doesn't support CC_wrapper without CC
# in make_global_settings yet.
- ['use_goma==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) and '
- '("<(GENERATOR)"=="ninja" or clang==1)', {
+ ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
'make_global_settings': [
['CC_wrapper', '<(gomadir)/gomacc'],
['CXX_wrapper', '<(gomadir)/gomacc'],