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

Side by Side Diff: build/common.gypi

Issue 195623002: roll clang 198389:202554 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 3496 matching lines...) Expand 10 before | Expand all | Expand 10 after
3507 # this is worth fixing. 3507 # this is worth fixing.
3508 '-Wno-c++11-narrowing', 3508 '-Wno-c++11-narrowing',
3509 3509
3510 # TODO(thakis): Remove, http://crbug.com/263960 3510 # TODO(thakis): Remove, http://crbug.com/263960
3511 '-Wno-reserved-user-defined-literal', 3511 '-Wno-reserved-user-defined-literal',
3512 3512
3513 # Clang considers the `register` keyword as deprecated, but e.g. 3513 # Clang considers the `register` keyword as deprecated, but e.g.
3514 # code generated by flex (used in angle) contains that keyword. 3514 # code generated by flex (used in angle) contains that keyword.
3515 # http://crbug.com/255186 3515 # http://crbug.com/255186
3516 '-Wno-deprecated-register', 3516 '-Wno-deprecated-register',
3517
3518 # TODO(thakis): Remove, http://crbug.com/341352
3519 '-Wno-absolute-value',
3517 ], 3520 ],
3518 'cflags!': [ 3521 'cflags!': [
3519 # Clang doesn't seem to know know this flag. 3522 # Clang doesn't seem to know know this flag.
3520 '-mfpmath=sse', 3523 '-mfpmath=sse',
3521 ], 3524 ],
3522 'cflags_cc': [ 3525 'cflags_cc': [
3523 # See the comment in the Mac section for what it takes to move 3526 # See the comment in the Mac section for what it takes to move
3524 # this to -std=c++11. 3527 # this to -std=c++11.
3525 '-std=gnu++11', 3528 '-std=gnu++11',
3526 ], 3529 ],
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
3959 'cflags': [ 3962 'cflags': [
3960 # Work around incompatibilities between bionic and clang 3963 # Work around incompatibilities between bionic and clang
3961 # headers. 3964 # headers.
3962 '-D__compiler_offsetof=__builtin_offsetof', 3965 '-D__compiler_offsetof=__builtin_offsetof',
3963 '-Dnan=__builtin_nan', 3966 '-Dnan=__builtin_nan',
3964 ], 3967 ],
3965 'conditions': [ 3968 'conditions': [
3966 ['target_arch=="arm"', { 3969 ['target_arch=="arm"', {
3967 'cflags': [ 3970 'cflags': [
3968 '-target arm-linux-androideabi', 3971 '-target arm-linux-androideabi',
3969 '-mllvm -arm-enable-ehabi',
3970 ], 3972 ],
3971 'ldflags': [ 3973 'ldflags': [
3972 '-target arm-linux-androideabi', 3974 '-target arm-linux-androideabi',
3973 ], 3975 ],
3974 }], 3976 }],
3975 ['target_arch=="ia32"', { 3977 ['target_arch=="ia32"', {
3976 'cflags': [ 3978 'cflags': [
3977 '-target x86-linux-androideabi', 3979 '-target x86-linux-androideabi',
3978 ], 3980 ],
3979 'ldflags': [ 3981 'ldflags': [
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
4248 # also contain a default: branch. Chrome is full of that. 4250 # also contain a default: branch. Chrome is full of that.
4249 '-Wno-covered-switch-default', 4251 '-Wno-covered-switch-default',
4250 4252
4251 # Warns when a const char[] is converted to bool. 4253 # Warns when a const char[] is converted to bool.
4252 '-Wstring-conversion', 4254 '-Wstring-conversion',
4253 4255
4254 # Clang considers the `register` keyword as deprecated, but 4256 # Clang considers the `register` keyword as deprecated, but
4255 # e.g. code generated by flex (used in angle) contains that 4257 # e.g. code generated by flex (used in angle) contains that
4256 # keyword. http://crbug.com/255186 4258 # keyword. http://crbug.com/255186
4257 '-Wno-deprecated-register', 4259 '-Wno-deprecated-register',
4260
4261 # TODO(thakis): Remove, http://crbug.com/341352
4262 '-Wno-absolute-value',
4258 ], 4263 ],
4259 4264
4260 'conditions': [ 4265 'conditions': [
4261 ['clang_xcode==0', { 4266 ['clang_xcode==0', {
4262 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 4267 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
4263 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 4268 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
4264 }], 4269 }],
4265 ], 4270 ],
4266 }], 4271 }],
4267 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { 4272 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
4887 '-Wno-extra-tokens', 4892 '-Wno-extra-tokens',
4888 '-Wno-ignored-attributes', 4893 '-Wno-ignored-attributes',
4889 '-Wno-incompatible-pointer-types', 4894 '-Wno-incompatible-pointer-types',
4890 '-Wno-int-to-void-pointer-cast', 4895 '-Wno-int-to-void-pointer-cast',
4891 '-Wno-invalid-noreturn', 4896 '-Wno-invalid-noreturn',
4892 '-Wno-logical-op-parentheses', 4897 '-Wno-logical-op-parentheses',
4893 '-Wno-microsoft', 4898 '-Wno-microsoft',
4894 '-Wno-missing-braces', 4899 '-Wno-missing-braces',
4895 '-Wno-missing-declarations', 4900 '-Wno-missing-declarations',
4896 '-Wno-msvc-include', 4901 '-Wno-msvc-include',
4902 '-Wno-absolute-value',
4897 '-Wno-null-dereference', 4903 '-Wno-null-dereference',
4898 '-Wno-overloaded-virtual', 4904 '-Wno-overloaded-virtual',
4899 '-Wno-parentheses', 4905 '-Wno-parentheses',
4900 '-Wno-pointer-sign', 4906 '-Wno-pointer-sign',
4901 '-Wno-reorder', 4907 '-Wno-reorder',
4902 '-Wno-return-type-c-linkage', 4908 '-Wno-return-type-c-linkage',
4903 '-Wno-self-assign', 4909 '-Wno-self-assign',
4904 '-Wno-sometimes-uninitialized', 4910 '-Wno-sometimes-uninitialized',
4905 '-Wno-switch', 4911 '-Wno-switch',
4906 '-Wno-tautological-compare', 4912 '-Wno-tautological-compare',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5144 # settings in target dicts. SYMROOT is a special case, because many other 5150 # settings in target dicts. SYMROOT is a special case, because many other
5145 # Xcode variables depend on it, including variables such as 5151 # Xcode variables depend on it, including variables such as
5146 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5152 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5147 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5153 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5148 # files to appear (when present) in the UI as actual files and not red 5154 # files to appear (when present) in the UI as actual files and not red
5149 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5155 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5150 # and therefore SYMROOT, needs to be set at the project level. 5156 # and therefore SYMROOT, needs to be set at the project level.
5151 'SYMROOT': '<(DEPTH)/xcodebuild', 5157 'SYMROOT': '<(DEPTH)/xcodebuild',
5152 }, 5158 },
5153 } 5159 }
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