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

Side by Side Diff: build/common.gypi

Issue 1208363002: clang/win: Don't pass -Wno-inconsistent-missing-override twice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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 | build/config/compiler/BUILD.gn » ('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 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), 2585 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
2586 # which happens in several places in chrome code. Not sure if 2586 # which happens in several places in chrome code. Not sure if
2587 # this is worth fixing. 2587 # this is worth fixing.
2588 '-Wno-c++11-narrowing', 2588 '-Wno-c++11-narrowing',
2589 2589
2590 # Clang considers the `register` keyword as deprecated, but e.g. 2590 # Clang considers the `register` keyword as deprecated, but e.g.
2591 # code generated by flex (used in angle) contains that keyword. 2591 # code generated by flex (used in angle) contains that keyword.
2592 # http://crbug.com/255186 2592 # http://crbug.com/255186
2593 '-Wno-deprecated-register', 2593 '-Wno-deprecated-register',
2594 2594
2595 # TODO(hans): Get this cleaned up. 2595 # TODO(hans): Get this cleaned up, http://crbug.com/428099
2596 '-Wno-inconsistent-missing-override', 2596 '-Wno-inconsistent-missing-override',
2597 ], 2597 ],
2598 }, 2598 },
2599 'includes': [ 'set_clang_warning_flags.gypi', ], 2599 'includes': [ 'set_clang_warning_flags.gypi', ],
2600 'defines': [ 2600 'defines': [
2601 # Don't use deprecated V8 APIs anywhere. 2601 # Don't use deprecated V8 APIs anywhere.
2602 'V8_DEPRECATION_WARNINGS', 2602 'V8_DEPRECATION_WARNINGS',
2603 ], 2603 ],
2604 'include_dirs': [ 2604 'include_dirs': [
2605 '<(SHARED_INTERMEDIATE_DIR)', 2605 '<(SHARED_INTERMEDIATE_DIR)',
(...skipping 3118 matching lines...) Expand 10 before | Expand all | Expand 10 after
5724 '-Wno-sometimes-uninitialized', 5724 '-Wno-sometimes-uninitialized',
5725 '-Wno-switch', 5725 '-Wno-switch',
5726 '-Wno-tautological-compare', 5726 '-Wno-tautological-compare',
5727 '-Wno-unknown-pragmas', 5727 '-Wno-unknown-pragmas',
5728 '-Wno-unsequenced', 5728 '-Wno-unsequenced',
5729 '-Wno-unused-function', 5729 '-Wno-unused-function',
5730 '-Wno-unused-private-field', 5730 '-Wno-unused-private-field',
5731 '-Wno-unused-value', 5731 '-Wno-unused-value',
5732 '-Wno-unused-variable', 5732 '-Wno-unused-variable',
5733 '-Wno-unused-local-typedef', # http://crbug.com/411648 5733 '-Wno-unused-local-typedef', # http://crbug.com/411648
5734 '-Wno-inconsistent-missing-override', # http://crbug.com/4280 99
5735 ], 5734 ],
5736 }, 5735 },
5737 }], 5736 }],
5738 ['clang==1 and target_arch=="ia32"', { 5737 ['clang==1 and target_arch=="ia32"', {
5739 'VCCLCompilerTool': { 5738 'VCCLCompilerTool': {
5740 'WarnAsError': 'false', 5739 'WarnAsError': 'false',
5741 'AdditionalOptions': [ 5740 'AdditionalOptions': [
5742 '/fallback', 5741 '/fallback',
5743 ], 5742 ],
5744 }, 5743 },
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
6201 # settings in target dicts. SYMROOT is a special case, because many other 6200 # settings in target dicts. SYMROOT is a special case, because many other
6202 # Xcode variables depend on it, including variables such as 6201 # Xcode variables depend on it, including variables such as
6203 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6202 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6204 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6203 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6205 # files to appear (when present) in the UI as actual files and not red 6204 # files to appear (when present) in the UI as actual files and not red
6206 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6205 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6207 # and therefore SYMROOT, needs to be set at the project level. 6206 # and therefore SYMROOT, needs to be set at the project level.
6208 'SYMROOT': '<(DEPTH)/xcodebuild', 6207 'SYMROOT': '<(DEPTH)/xcodebuild',
6209 }, 6208 },
6210 } 6209 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698