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

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: cros 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') | tools/clang/scripts/plugin_flags.sh » ('J')
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 3400 matching lines...) Expand 10 before | Expand all | Expand 10 after
3411 # this is worth fixing. 3411 # this is worth fixing.
3412 '-Wno-c++11-narrowing', 3412 '-Wno-c++11-narrowing',
3413 3413
3414 # TODO(thakis): Remove, http://crbug.com/263960 3414 # TODO(thakis): Remove, http://crbug.com/263960
3415 '-Wno-reserved-user-defined-literal', 3415 '-Wno-reserved-user-defined-literal',
3416 3416
3417 # Clang considers the `register` keyword as deprecated, but e.g. 3417 # Clang considers the `register` keyword as deprecated, but e.g.
3418 # code generated by flex (used in angle) contains that keyword. 3418 # code generated by flex (used in angle) contains that keyword.
3419 # http://crbug.com/255186 3419 # http://crbug.com/255186
3420 '-Wno-deprecated-register', 3420 '-Wno-deprecated-register',
3421
3422 # TODO(thakis): Remove, http://crbug.com/341352
3423 '-Wno-absolute-value',
3421 ], 3424 ],
3422 'cflags!': [ 3425 'cflags!': [
3423 # Clang doesn't seem to know know this flag. 3426 # Clang doesn't seem to know know this flag.
3424 '-mfpmath=sse', 3427 '-mfpmath=sse',
3425 ], 3428 ],
3426 'cflags_cc': [ 3429 'cflags_cc': [
3427 # See the comment in the Mac section for what it takes to move 3430 # See the comment in the Mac section for what it takes to move
3428 # this to -std=c++11. 3431 # this to -std=c++11.
3429 '-std=gnu++11', 3432 '-std=gnu++11',
3430 ], 3433 ],
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
3852 'cflags': [ 3855 'cflags': [
3853 # Work around incompatibilities between bionic and clang 3856 # Work around incompatibilities between bionic and clang
3854 # headers. 3857 # headers.
3855 '-D__compiler_offsetof=__builtin_offsetof', 3858 '-D__compiler_offsetof=__builtin_offsetof',
3856 '-Dnan=__builtin_nan', 3859 '-Dnan=__builtin_nan',
3857 ], 3860 ],
3858 'conditions': [ 3861 'conditions': [
3859 ['target_arch=="arm"', { 3862 ['target_arch=="arm"', {
3860 'cflags': [ 3863 'cflags': [
3861 '-target arm-linux-androideabi', 3864 '-target arm-linux-androideabi',
3862 '-mllvm -arm-enable-ehabi',
3863 ], 3865 ],
3864 'ldflags': [ 3866 'ldflags': [
3865 '-target arm-linux-androideabi', 3867 '-target arm-linux-androideabi',
3866 ], 3868 ],
3867 }], 3869 }],
3868 ['target_arch=="ia32"', { 3870 ['target_arch=="ia32"', {
3869 'cflags': [ 3871 'cflags': [
3870 '-target x86-linux-androideabi', 3872 '-target x86-linux-androideabi',
3871 ], 3873 ],
3872 'ldflags': [ 3874 'ldflags': [
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
4132 # also contain a default: branch. Chrome is full of that. 4134 # also contain a default: branch. Chrome is full of that.
4133 '-Wno-covered-switch-default', 4135 '-Wno-covered-switch-default',
4134 4136
4135 # Warns when a const char[] is converted to bool. 4137 # Warns when a const char[] is converted to bool.
4136 '-Wstring-conversion', 4138 '-Wstring-conversion',
4137 4139
4138 # Clang considers the `register` keyword as deprecated, but 4140 # Clang considers the `register` keyword as deprecated, but
4139 # e.g. code generated by flex (used in angle) contains that 4141 # e.g. code generated by flex (used in angle) contains that
4140 # keyword. http://crbug.com/255186 4142 # keyword. http://crbug.com/255186
4141 '-Wno-deprecated-register', 4143 '-Wno-deprecated-register',
4144
4145 # TODO(thakis): Remove, http://crbug.com/341352
4146 '-Wno-absolute-value',
4142 ], 4147 ],
4143 4148
4144 'conditions': [ 4149 'conditions': [
4145 ['clang_xcode==0', { 4150 ['clang_xcode==0', {
4146 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 4151 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
4147 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 4152 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
4148 }], 4153 }],
4149 ], 4154 ],
4150 }], 4155 }],
4151 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { 4156 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
4765 '-Wno-extra-tokens', 4770 '-Wno-extra-tokens',
4766 '-Wno-ignored-attributes', 4771 '-Wno-ignored-attributes',
4767 '-Wno-incompatible-pointer-types', 4772 '-Wno-incompatible-pointer-types',
4768 '-Wno-int-to-void-pointer-cast', 4773 '-Wno-int-to-void-pointer-cast',
4769 '-Wno-invalid-noreturn', 4774 '-Wno-invalid-noreturn',
4770 '-Wno-logical-op-parentheses', 4775 '-Wno-logical-op-parentheses',
4771 '-Wno-microsoft', 4776 '-Wno-microsoft',
4772 '-Wno-missing-braces', 4777 '-Wno-missing-braces',
4773 '-Wno-missing-declarations', 4778 '-Wno-missing-declarations',
4774 '-Wno-msvc-include', 4779 '-Wno-msvc-include',
4780 '-Wno-absolute-value',
4775 '-Wno-null-dereference', 4781 '-Wno-null-dereference',
4776 '-Wno-overloaded-virtual', 4782 '-Wno-overloaded-virtual',
4777 '-Wno-parentheses', 4783 '-Wno-parentheses',
4778 '-Wno-pointer-sign', 4784 '-Wno-pointer-sign',
4779 '-Wno-reorder', 4785 '-Wno-reorder',
4780 '-Wno-return-type-c-linkage', 4786 '-Wno-return-type-c-linkage',
4781 '-Wno-self-assign', 4787 '-Wno-self-assign',
4782 '-Wno-sometimes-uninitialized', 4788 '-Wno-sometimes-uninitialized',
4783 '-Wno-switch', 4789 '-Wno-switch',
4784 '-Wno-tautological-compare', 4790 '-Wno-tautological-compare',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5022 # settings in target dicts. SYMROOT is a special case, because many other 5028 # settings in target dicts. SYMROOT is a special case, because many other
5023 # Xcode variables depend on it, including variables such as 5029 # Xcode variables depend on it, including variables such as
5024 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5030 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5025 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5031 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5026 # files to appear (when present) in the UI as actual files and not red 5032 # files to appear (when present) in the UI as actual files and not red
5027 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5033 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5028 # and therefore SYMROOT, needs to be set at the project level. 5034 # and therefore SYMROOT, needs to be set at the project level.
5029 'SYMROOT': '<(DEPTH)/xcodebuild', 5035 'SYMROOT': '<(DEPTH)/xcodebuild',
5030 }, 5036 },
5031 } 5037 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | tools/clang/scripts/plugin_flags.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698