build/common.gypi - Issue 183213002: Remove hack disabling goma when building using Xcode clang

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/common.gypi

Issue 183213002: Remove hack disabling goma when building using Xcode clang (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index f0201a8fe2f4a79e86c0345cff30a2d350d3aa53..2735ac8d580526c9a59406cf2049af6b4c26c1f2 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'],

« no previous file with comments | « no previous file | no next file » | no next file with comments »