Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side 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, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 4951 matching lines...) Expand 10 before | Expand all | Expand 10 after
4962 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], 4962 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'],
4963 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], 4963 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'],
4964 ['CC.host', '<!(which gcc)'], 4964 ['CC.host', '<!(which gcc)'],
4965 ['CXX.host', '<!(which g++)'], 4965 ['CXX.host', '<!(which g++)'],
4966 ], 4966 ],
4967 }], 4967 }],
4968 4968
4969 # TODO(yyanagisawa): supports GENERATOR==make 4969 # TODO(yyanagisawa): supports GENERATOR==make
4970 # make generator doesn't support CC_wrapper without CC 4970 # make generator doesn't support CC_wrapper without CC
4971 # in make_global_settings yet. 4971 # in make_global_settings yet.
4972 ['use_goma==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) and ' 4972 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
4973 '("<(GENERATOR)"=="ninja" or clang==1)', {
4974 'make_global_settings': [ 4973 'make_global_settings': [
4975 ['CC_wrapper', '<(gomadir)/gomacc'], 4974 ['CC_wrapper', '<(gomadir)/gomacc'],
4976 ['CXX_wrapper', '<(gomadir)/gomacc'], 4975 ['CXX_wrapper', '<(gomadir)/gomacc'],
4977 ['CC.host_wrapper', '<(gomadir)/gomacc'], 4976 ['CC.host_wrapper', '<(gomadir)/gomacc'],
4978 ['CXX.host_wrapper', '<(gomadir)/gomacc'], 4977 ['CXX.host_wrapper', '<(gomadir)/gomacc'],
4979 ], 4978 ],
4980 }], 4979 }],
4981 ], 4980 ],
4982 'xcode_settings': { 4981 'xcode_settings': {
4983 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! 4982 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
5041 # settings in target dicts. SYMROOT is a special case, because many other 5040 # settings in target dicts. SYMROOT is a special case, because many other
5042 # Xcode variables depend on it, including variables such as 5041 # Xcode variables depend on it, including variables such as
5043 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5042 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5044 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5043 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5045 # files to appear (when present) in the UI as actual files and not red 5044 # files to appear (when present) in the UI as actual files and not red
5046 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5045 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5047 # and therefore SYMROOT, needs to be set at the project level. 5046 # and therefore SYMROOT, needs to be set at the project level.
5048 'SYMROOT': '<(DEPTH)/xcodebuild', 5047 'SYMROOT': '<(DEPTH)/xcodebuild',
5049 }, 5048 },
5050 } 5049 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698