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

Side by Side Diff: build/common.gypi

Issue 693893004: ios: Switch from -std=gnu++0x to -std=c++11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 5117 matching lines...) Expand 10 before | Expand all | Expand 10 after
5128 }], # mac_real_dsym 5128 }], # mac_real_dsym
5129 ], # target_conditions 5129 ], # target_conditions
5130 }], # (_type=="executable" or _type=="shared_library" or 5130 }], # (_type=="executable" or _type=="shared_library" or
5131 # _type=="loadable_module") and mac_strip!=0 5131 # _type=="loadable_module") and mac_strip!=0
5132 ], # target_conditions 5132 ], # target_conditions
5133 }, # target_defaults 5133 }, # target_defaults
5134 }], # OS=="mac" 5134 }], # OS=="mac"
5135 ['OS=="ios"', { 5135 ['OS=="ios"', {
5136 'target_defaults': { 5136 'target_defaults': {
5137 'xcode_settings' : { 5137 'xcode_settings' : {
5138 # TODO(stuartmorgan): switch to c++0x (see TODOs in the clang 5138 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
5139 # section above).
5140 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x',
5141 5139
5142 'conditions': [ 5140 'conditions': [
5143 # Older Xcodes do not support -Wno-deprecated-register, so pass an 5141 # Older Xcodes do not support -Wno-deprecated-register, so pass an
5144 # additional flag to suppress the "unknown compiler option" error. 5142 # additional flag to suppress the "unknown compiler option" error.
5145 # Restrict this flag to builds that are either compiling with Xcode 5143 # Restrict this flag to builds that are either compiling with Xcode
5146 # or compiling with Xcode's Clang. This will allow Ninja builds to 5144 # or compiling with Xcode's Clang. This will allow Ninja builds to
5147 # continue failing on unknown compiler options. 5145 # continue failing on unknown compiler options.
5148 # TODO(rohitrao): This flag is temporary and should be removed as 5146 # TODO(rohitrao): This flag is temporary and should be removed as
5149 # soon as the iOS bots are updated to use Xcode 5.1. 5147 # soon as the iOS bots are updated to use Xcode 5.1.
5150 ['clang_xcode==1', { 5148 ['clang_xcode==1', {
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
5873 # settings in target dicts. SYMROOT is a special case, because many other 5871 # settings in target dicts. SYMROOT is a special case, because many other
5874 # Xcode variables depend on it, including variables such as 5872 # Xcode variables depend on it, including variables such as
5875 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5873 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5876 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5874 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5877 # files to appear (when present) in the UI as actual files and not red 5875 # files to appear (when present) in the UI as actual files and not red
5878 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5876 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5879 # and therefore SYMROOT, needs to be set at the project level. 5877 # and therefore SYMROOT, needs to be set at the project level.
5880 'SYMROOT': '<(DEPTH)/xcodebuild', 5878 'SYMROOT': '<(DEPTH)/xcodebuild',
5881 }, 5879 },
5882 } 5880 }
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