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

Side by Side Diff: trunk/src/build/common.gypi

Issue 20920002: Revert 214049 "clang: Remove -Wno-reserved-user-defined-literal ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | 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 3809 matching lines...) Expand 10 before | Expand all | Expand 10 after
3820 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 3820 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
3821 'WARNING_CFLAGS': [ 3821 'WARNING_CFLAGS': [
3822 '-Wheader-hygiene', 3822 '-Wheader-hygiene',
3823 3823
3824 # This warns on using ints as initializers for floats in 3824 # This warns on using ints as initializers for floats in
3825 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), 3825 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
3826 # which happens in several places in chrome code. Not sure if 3826 # which happens in several places in chrome code. Not sure if
3827 # this is worth fixing. 3827 # this is worth fixing.
3828 '-Wno-c++11-narrowing', 3828 '-Wno-c++11-narrowing',
3829 3829
3830 # TODO(thakis): Remove, http://crbug.com/263960
3831 '-Wno-reserved-user-defined-literal',
3832
3830 # Don't die on dtoa code that uses a char as an array index. 3833 # Don't die on dtoa code that uses a char as an array index.
3831 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 3834 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
3832 '-Wno-char-subscripts', 3835 '-Wno-char-subscripts',
3833 3836
3834 # Clang spots more unused functions. 3837 # Clang spots more unused functions.
3835 '-Wno-unused-function', 3838 '-Wno-unused-function',
3836 3839
3837 # Warns on switches on enums that cover all enum values but 3840 # Warns on switches on enums that cover all enum values but
3838 # also contain a default: branch. Chrome is full of that. 3841 # also contain a default: branch. Chrome is full of that.
3839 '-Wno-covered-switch-default', 3842 '-Wno-covered-switch-default',
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
4125 '-Wheader-hygiene', 4128 '-Wheader-hygiene',
4126 # Don't die on dtoa code that uses a char as an array index. 4129 # Don't die on dtoa code that uses a char as an array index.
4127 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 4130 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
4128 '-Wno-char-subscripts', 4131 '-Wno-char-subscripts',
4129 # Clang spots more unused functions. 4132 # Clang spots more unused functions.
4130 '-Wno-unused-function', 4133 '-Wno-unused-function',
4131 # See comments on this flag higher up in this file. 4134 # See comments on this flag higher up in this file.
4132 '-Wno-unnamed-type-template-args', 4135 '-Wno-unnamed-type-template-args',
4133 # Match OS X clang C++11 warning settings. 4136 # Match OS X clang C++11 warning settings.
4134 '-Wno-c++11-narrowing', 4137 '-Wno-c++11-narrowing',
4138 # TODO(thakis): Remove, http://crbug.com/263960
4139 '-Wno-reserved-user-defined-literal',
4135 ], 4140 ],
4136 }, 4141 },
4137 'target_conditions': [ 4142 'target_conditions': [
4138 ['_toolset=="host"', { 4143 ['_toolset=="host"', {
4139 'xcode_settings': { 4144 'xcode_settings': {
4140 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 4145 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
4141 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', 4146 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
4142 }, 4147 },
4143 'conditions': [ 4148 'conditions': [
4144 ['"<(GENERATOR)"!="xcode"', { 4149 ['"<(GENERATOR)"!="xcode"', {
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
4633 # settings in target dicts. SYMROOT is a special case, because many other 4638 # settings in target dicts. SYMROOT is a special case, because many other
4634 # Xcode variables depend on it, including variables such as 4639 # Xcode variables depend on it, including variables such as
4635 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4640 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4636 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4641 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4637 # files to appear (when present) in the UI as actual files and not red 4642 # files to appear (when present) in the UI as actual files and not red
4638 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4643 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4639 # and therefore SYMROOT, needs to be set at the project level. 4644 # and therefore SYMROOT, needs to be set at the project level.
4640 'SYMROOT': '<(DEPTH)/xcodebuild', 4645 'SYMROOT': '<(DEPTH)/xcodebuild',
4641 }, 4646 },
4642 } 4647 }
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