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

Side by Side Diff: build/common.gypi

Issue 221623003: roll clang 202555:204777 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | 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 4292 matching lines...) Expand 10 before | Expand all | Expand 10 after
4303 # Warns when a const char[] is converted to bool. 4303 # Warns when a const char[] is converted to bool.
4304 '-Wstring-conversion', 4304 '-Wstring-conversion',
4305 4305
4306 # Clang considers the `register` keyword as deprecated, but 4306 # Clang considers the `register` keyword as deprecated, but
4307 # e.g. code generated by flex (used in angle) contains that 4307 # e.g. code generated by flex (used in angle) contains that
4308 # keyword. http://crbug.com/255186 4308 # keyword. http://crbug.com/255186
4309 '-Wno-deprecated-register', 4309 '-Wno-deprecated-register',
4310 4310
4311 # TODO(thakis): Remove, http://crbug.com/341352 4311 # TODO(thakis): Remove, http://crbug.com/341352
4312 '-Wno-absolute-value', 4312 '-Wno-absolute-value',
4313
4314 # This warns on selectors from Cocoa headers (-length, -set).
4315 # cfe-dev is currently discussing the merits of this warning.
4316 # TODO(thakis): Reevaluate what to do with this, based one
4317 # cfe-dev discussion.
4318 '-Wno-selector-type-mismatch',
4313 ], 4319 ],
4314 4320
4315 'conditions': [ 4321 'conditions': [
4316 ['clang_xcode==0', { 4322 ['clang_xcode==0', {
4317 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 4323 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
4318 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 4324 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
4319 }], 4325 }],
4320 ], 4326 ],
4321 }], 4327 }],
4322 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { 4328 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
5200 # settings in target dicts. SYMROOT is a special case, because many other 5206 # settings in target dicts. SYMROOT is a special case, because many other
5201 # Xcode variables depend on it, including variables such as 5207 # Xcode variables depend on it, including variables such as
5202 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5208 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5203 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5209 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5204 # files to appear (when present) in the UI as actual files and not red 5210 # files to appear (when present) in the UI as actual files and not red
5205 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5211 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5206 # and therefore SYMROOT, needs to be set at the project level. 5212 # and therefore SYMROOT, needs to be set at the project level.
5207 'SYMROOT': '<(DEPTH)/xcodebuild', 5213 'SYMROOT': '<(DEPTH)/xcodebuild',
5208 }, 5214 },
5209 } 5215 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698