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

Side by Side Diff: build/common.gypi

Issue 211213004: clang roll 198389:202554 reloaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes for 10.6 support 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 | Annotate | Revision Log
« 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 3504 matching lines...) Expand 10 before | Expand all | Expand 10 after
3515 # this is worth fixing. 3515 # this is worth fixing.
3516 '-Wno-c++11-narrowing', 3516 '-Wno-c++11-narrowing',
3517 3517
3518 # TODO(thakis): Remove, http://crbug.com/263960 3518 # TODO(thakis): Remove, http://crbug.com/263960
3519 '-Wno-reserved-user-defined-literal', 3519 '-Wno-reserved-user-defined-literal',
3520 3520
3521 # Clang considers the `register` keyword as deprecated, but e.g. 3521 # Clang considers the `register` keyword as deprecated, but e.g.
3522 # code generated by flex (used in angle) contains that keyword. 3522 # code generated by flex (used in angle) contains that keyword.
3523 # http://crbug.com/255186 3523 # http://crbug.com/255186
3524 '-Wno-deprecated-register', 3524 '-Wno-deprecated-register',
3525
3526 # TODO(thakis): Remove, http://crbug.com/341352
3527 '-Wno-absolute-value',
3525 ], 3528 ],
3526 'cflags!': [ 3529 'cflags!': [
3527 # Clang doesn't seem to know know this flag. 3530 # Clang doesn't seem to know know this flag.
3528 '-mfpmath=sse', 3531 '-mfpmath=sse',
3529 ], 3532 ],
3530 'cflags_cc': [ 3533 'cflags_cc': [
3531 # See the comment in the Mac section for what it takes to move 3534 # See the comment in the Mac section for what it takes to move
3532 # this to -std=c++11. 3535 # this to -std=c++11.
3533 '-std=gnu++11', 3536 '-std=gnu++11',
3534 ], 3537 ],
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
3967 'cflags': [ 3970 'cflags': [
3968 # Work around incompatibilities between bionic and clang 3971 # Work around incompatibilities between bionic and clang
3969 # headers. 3972 # headers.
3970 '-D__compiler_offsetof=__builtin_offsetof', 3973 '-D__compiler_offsetof=__builtin_offsetof',
3971 '-Dnan=__builtin_nan', 3974 '-Dnan=__builtin_nan',
3972 ], 3975 ],
3973 'conditions': [ 3976 'conditions': [
3974 ['target_arch=="arm"', { 3977 ['target_arch=="arm"', {
3975 'cflags': [ 3978 'cflags': [
3976 '-target arm-linux-androideabi', 3979 '-target arm-linux-androideabi',
3977 '-mllvm -arm-enable-ehabi',
3978 ], 3980 ],
3979 'ldflags': [ 3981 'ldflags': [
3980 '-target arm-linux-androideabi', 3982 '-target arm-linux-androideabi',
3981 ], 3983 ],
3982 }], 3984 }],
3983 ['target_arch=="ia32"', { 3985 ['target_arch=="ia32"', {
3984 'cflags': [ 3986 'cflags': [
3985 '-target x86-linux-androideabi', 3987 '-target x86-linux-androideabi',
3986 ], 3988 ],
3987 'ldflags': [ 3989 'ldflags': [
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
4256 # also contain a default: branch. Chrome is full of that. 4258 # also contain a default: branch. Chrome is full of that.
4257 '-Wno-covered-switch-default', 4259 '-Wno-covered-switch-default',
4258 4260
4259 # Warns when a const char[] is converted to bool. 4261 # Warns when a const char[] is converted to bool.
4260 '-Wstring-conversion', 4262 '-Wstring-conversion',
4261 4263
4262 # Clang considers the `register` keyword as deprecated, but 4264 # Clang considers the `register` keyword as deprecated, but
4263 # e.g. code generated by flex (used in angle) contains that 4265 # e.g. code generated by flex (used in angle) contains that
4264 # keyword. http://crbug.com/255186 4266 # keyword. http://crbug.com/255186
4265 '-Wno-deprecated-register', 4267 '-Wno-deprecated-register',
4268
4269 # TODO(thakis): Remove, http://crbug.com/341352
4270 '-Wno-absolute-value',
4266 ], 4271 ],
4267 4272
4268 'conditions': [ 4273 'conditions': [
4269 ['clang_xcode==0', { 4274 ['clang_xcode==0', {
4270 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 4275 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
4271 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 4276 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
4272 }], 4277 }],
4273 ], 4278 ],
4274 }], 4279 }],
4275 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { 4280 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
4895 '-Wno-extra-tokens', 4900 '-Wno-extra-tokens',
4896 '-Wno-ignored-attributes', 4901 '-Wno-ignored-attributes',
4897 '-Wno-incompatible-pointer-types', 4902 '-Wno-incompatible-pointer-types',
4898 '-Wno-int-to-void-pointer-cast', 4903 '-Wno-int-to-void-pointer-cast',
4899 '-Wno-invalid-noreturn', 4904 '-Wno-invalid-noreturn',
4900 '-Wno-logical-op-parentheses', 4905 '-Wno-logical-op-parentheses',
4901 '-Wno-microsoft', 4906 '-Wno-microsoft',
4902 '-Wno-missing-braces', 4907 '-Wno-missing-braces',
4903 '-Wno-missing-declarations', 4908 '-Wno-missing-declarations',
4904 '-Wno-msvc-include', 4909 '-Wno-msvc-include',
4910 '-Wno-absolute-value',
4905 '-Wno-null-dereference', 4911 '-Wno-null-dereference',
4906 '-Wno-overloaded-virtual', 4912 '-Wno-overloaded-virtual',
4907 '-Wno-parentheses', 4913 '-Wno-parentheses',
4908 '-Wno-pointer-sign', 4914 '-Wno-pointer-sign',
4909 '-Wno-reorder', 4915 '-Wno-reorder',
4910 '-Wno-return-type-c-linkage', 4916 '-Wno-return-type-c-linkage',
4911 '-Wno-self-assign', 4917 '-Wno-self-assign',
4912 '-Wno-sometimes-uninitialized', 4918 '-Wno-sometimes-uninitialized',
4913 '-Wno-switch', 4919 '-Wno-switch',
4914 '-Wno-tautological-compare', 4920 '-Wno-tautological-compare',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5152 # settings in target dicts. SYMROOT is a special case, because many other 5158 # settings in target dicts. SYMROOT is a special case, because many other
5153 # Xcode variables depend on it, including variables such as 5159 # Xcode variables depend on it, including variables such as
5154 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5160 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5155 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5161 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5156 # files to appear (when present) in the UI as actual files and not red 5162 # files to appear (when present) in the UI as actual files and not red
5157 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5163 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5158 # and therefore SYMROOT, needs to be set at the project level. 5164 # and therefore SYMROOT, needs to be set at the project level.
5159 'SYMROOT': '<(DEPTH)/xcodebuild', 5165 'SYMROOT': '<(DEPTH)/xcodebuild',
5160 }, 5166 },
5161 } 5167 }
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