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

Side by Side Diff: build/common.gypi

Issue 23717036: mac&ios: Do not disable CLANG_WARN_CXX0X_EXTENSIONS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 3 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 3862 matching lines...) Expand 10 before | Expand all | Expand 10 after
3873 ['clang==1', { 3873 ['clang==1', {
3874 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 3874 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
3875 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 3875 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
3876 3876
3877 # gnu++11 instead of c++11 is needed because some code uses 3877 # gnu++11 instead of c++11 is needed because some code uses
3878 # typeof() (a GNU extension). 3878 # typeof() (a GNU extension).
3879 # TODO(thakis): Eventually switch this to c++11 instead of 3879 # TODO(thakis): Eventually switch this to c++11 instead of
3880 # gnu++11 (once typeof can be removed, which is blocked on c++11 3880 # gnu++11 (once typeof can be removed, which is blocked on c++11
3881 # being available everywhere). 3881 # being available everywhere).
3882 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11', # -std=gnu++11 3882 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11', # -std=gnu++11
3883 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default
3884 # when building with clang. This warning is triggered when the
3885 # override keyword is used via the OVERRIDE macro from
3886 # base/compiler_specific.h.
3887 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
3888 # Warn if automatic synthesis is triggered with 3883 # Warn if automatic synthesis is triggered with
3889 # the -Wobjc-missing-property-synthesis flag. 3884 # the -Wobjc-missing-property-synthesis flag.
3890 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 3885 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
3891 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 3886 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
3892 'WARNING_CFLAGS': [ 3887 'WARNING_CFLAGS': [
3893 '-Wheader-hygiene', 3888 '-Wheader-hygiene',
3894 3889
3895 # This warns on using ints as initializers for floats in 3890 # This warns on using ints as initializers for floats in
3896 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), 3891 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
3897 # which happens in several places in chrome code. Not sure if 3892 # which happens in several places in chrome code. Not sure if
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
4168 ], # target_conditions 4163 ], # target_conditions
4169 }, # target_defaults 4164 }, # target_defaults
4170 }], # OS=="mac" 4165 }], # OS=="mac"
4171 ['OS=="ios"', { 4166 ['OS=="ios"', {
4172 'target_defaults': { 4167 'target_defaults': {
4173 'xcode_settings' : { 4168 'xcode_settings' : {
4174 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 4169 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
4175 4170
4176 # This next block is mostly common with the 'mac' section above, 4171 # This next block is mostly common with the 'mac' section above,
4177 # but keying off (or setting) 'clang' isn't valid for iOS as it 4172 # but keying off (or setting) 'clang' isn't valid for iOS as it
4178 # also seems to mean using the custom build of clang. 4173 # also means using Chromium's build of clang.
4179 4174
4180 # TODO(stuartmorgan): switch to c++0x (see TODOs in the clang 4175 # TODO(stuartmorgan): switch to c++0x (see TODOs in the clang
4181 # section above). 4176 # section above).
4182 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', 4177 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x',
4183 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default
4184 # when building with clang. This warning is triggered when the
4185 # override keyword is used via the OVERRIDE macro from
4186 # base/compiler_specific.h.
4187 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
4188 # Warn if automatic synthesis is triggered with 4178 # Warn if automatic synthesis is triggered with
4189 # the -Wobjc-missing-property-synthesis flag. 4179 # the -Wobjc-missing-property-synthesis flag.
4190 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 4180 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
4191 'WARNING_CFLAGS': [ 4181 'WARNING_CFLAGS': [
4192 '-Wheader-hygiene', 4182 '-Wheader-hygiene',
4193 # Don't die on dtoa code that uses a char as an array index. 4183 # Don't die on dtoa code that uses a char as an array index.
4194 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 4184 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
4195 '-Wno-char-subscripts', 4185 '-Wno-char-subscripts',
4196 # Clang spots more unused functions. 4186 # Clang spots more unused functions.
4197 '-Wno-unused-function', 4187 '-Wno-unused-function',
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
4735 # settings in target dicts. SYMROOT is a special case, because many other 4725 # settings in target dicts. SYMROOT is a special case, because many other
4736 # Xcode variables depend on it, including variables such as 4726 # Xcode variables depend on it, including variables such as
4737 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4727 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4738 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4728 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4739 # files to appear (when present) in the UI as actual files and not red 4729 # files to appear (when present) in the UI as actual files and not red
4740 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4730 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4741 # and therefore SYMROOT, needs to be set at the project level. 4731 # and therefore SYMROOT, needs to be set at the project level.
4742 'SYMROOT': '<(DEPTH)/xcodebuild', 4732 'SYMROOT': '<(DEPTH)/xcodebuild',
4743 }, 4733 },
4744 } 4734 }
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