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

Side by Side Diff: build/common.gypi

Issue 194803006: Adds -Wno-deprecated-register to the build settings for iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved -Wno-unknown-warning-option 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 4445 matching lines...) Expand 10 before | Expand all | Expand 10 after
4456 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 4456 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
4457 'WARNING_CFLAGS': [ 4457 'WARNING_CFLAGS': [
4458 '-Wheader-hygiene', 4458 '-Wheader-hygiene',
4459 # Don't die on dtoa code that uses a char as an array index. 4459 # Don't die on dtoa code that uses a char as an array index.
4460 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 4460 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
4461 '-Wno-char-subscripts', 4461 '-Wno-char-subscripts',
4462 # See comment in the mac clang section above for this flag. 4462 # See comment in the mac clang section above for this flag.
4463 '-Wno-unneeded-internal-declaration', 4463 '-Wno-unneeded-internal-declaration',
4464 # Match OS X clang C++11 warning settings. 4464 # Match OS X clang C++11 warning settings.
4465 '-Wno-c++11-narrowing', 4465 '-Wno-c++11-narrowing',
4466 # As of Xcode 5.1, the register keyword is deprecated, but Chromium
4467 # code still uses it.
4468 '-Wno-deprecated-register',
rohitrao (ping after 24h) 2014/03/11 21:09:39 -Wno-deprecated-register is now passed *twice* for
Mark Mentovai 2014/03/11 21:39:52 rohitrao wrote:
rohitrao (ping after 24h) 2014/03/11 21:49:31 "clang==1" is only true if you're using Ninja. It
Mark Mentovai 2014/03/11 21:55:46 rohitrao wrote:
4466 ], 4469 ],
4467 4470
4468 # Limit the valid architectures depending on "target_subarch". 4471 # Limit the valid architectures depending on "target_subarch".
Mark Mentovai 2014/03/11 21:39:52 This comment goes with the target_subarch conditio
rohitrao (ping after 24h) 2014/03/11 21:49:31 Done.
4469 # This need to include the "arm" architectures but also the "x86" 4472 # This need to include the "arm" architectures but also the "x86"
4470 # ones (they are used when building for the simulator). 4473 # ones (they are used when building for the simulator).
4471 'conditions': [ 4474 'conditions': [
4475 # Older Xcodes do not support -Wno-deprecated-register, so pass an
4476 # additional flag to suppress the "unknown compiler option" error.
4477 # Restrict this flag to builds that are either compiling with Xcode
4478 # or compiling with Xcode's Clang. This will allow Ninja builds to
4479 # continue failing on unknown compiler options.
4480 # TODO(rohitrao): This flag is temporary and should be removed as
4481 # soon as the iOS bots are updated to use Xcode 5.1.
4482 ['"<(GENERATOR)"=="xcode" or clang_xcode==1', {
4483 'WARNING_CFLAGS': [
4484 '-Wno-unknown-warning-option',
4485 ],
4486 }],
4472 ['target_subarch=="arm32"', { 4487 ['target_subarch=="arm32"', {
4473 'VALID_ARCHS': ['armv7', 'i386'], 4488 'VALID_ARCHS': ['armv7', 'i386'],
4474 }], 4489 }],
4475 ['target_subarch=="arm64"', { 4490 ['target_subarch=="arm64"', {
4476 'VALID_ARCHS': ['arm64', 'x86_64'], 4491 'VALID_ARCHS': ['arm64', 'x86_64'],
4477 }], 4492 }],
4478 ['target_subarch=="both"', { 4493 ['target_subarch=="both"', {
4479 'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'], 4494 'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'],
4480 }], 4495 }],
4481 ], 4496 ],
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
5052 # settings in target dicts. SYMROOT is a special case, because many other 5067 # settings in target dicts. SYMROOT is a special case, because many other
5053 # Xcode variables depend on it, including variables such as 5068 # Xcode variables depend on it, including variables such as
5054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5069 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5070 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5056 # files to appear (when present) in the UI as actual files and not red 5071 # files to appear (when present) in the UI as actual files and not red
5057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5072 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5058 # and therefore SYMROOT, needs to be set at the project level. 5073 # and therefore SYMROOT, needs to be set at the project level.
5059 'SYMROOT': '<(DEPTH)/xcodebuild', 5074 'SYMROOT': '<(DEPTH)/xcodebuild',
5060 }, 5075 },
5061 } 5076 }
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