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

Side by Side Diff: trunk/src/build/common.gypi

Issue 203313004: Revert 257618 "roll clang 198389:202554" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | trunk/src/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 3419 matching lines...) Expand 10 before | Expand all | Expand 10 after
3430 # this is worth fixing. 3430 # this is worth fixing.
3431 '-Wno-c++11-narrowing', 3431 '-Wno-c++11-narrowing',
3432 3432
3433 # TODO(thakis): Remove, http://crbug.com/263960 3433 # TODO(thakis): Remove, http://crbug.com/263960
3434 '-Wno-reserved-user-defined-literal', 3434 '-Wno-reserved-user-defined-literal',
3435 3435
3436 # Clang considers the `register` keyword as deprecated, but e.g. 3436 # Clang considers the `register` keyword as deprecated, but e.g.
3437 # code generated by flex (used in angle) contains that keyword. 3437 # code generated by flex (used in angle) contains that keyword.
3438 # http://crbug.com/255186 3438 # http://crbug.com/255186
3439 '-Wno-deprecated-register', 3439 '-Wno-deprecated-register',
3440
3441 # TODO(thakis): Remove, http://crbug.com/341352
3442 '-Wno-absolute-value',
3443 ], 3440 ],
3444 'cflags!': [ 3441 'cflags!': [
3445 # Clang doesn't seem to know know this flag. 3442 # Clang doesn't seem to know know this flag.
3446 '-mfpmath=sse', 3443 '-mfpmath=sse',
3447 ], 3444 ],
3448 'cflags_cc': [ 3445 'cflags_cc': [
3449 # See the comment in the Mac section for what it takes to move 3446 # See the comment in the Mac section for what it takes to move
3450 # this to -std=c++11. 3447 # this to -std=c++11.
3451 '-std=gnu++11', 3448 '-std=gnu++11',
3452 ], 3449 ],
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
3885 'cflags': [ 3882 'cflags': [
3886 # Work around incompatibilities between bionic and clang 3883 # Work around incompatibilities between bionic and clang
3887 # headers. 3884 # headers.
3888 '-D__compiler_offsetof=__builtin_offsetof', 3885 '-D__compiler_offsetof=__builtin_offsetof',
3889 '-Dnan=__builtin_nan', 3886 '-Dnan=__builtin_nan',
3890 ], 3887 ],
3891 'conditions': [ 3888 'conditions': [
3892 ['target_arch=="arm"', { 3889 ['target_arch=="arm"', {
3893 'cflags': [ 3890 'cflags': [
3894 '-target arm-linux-androideabi', 3891 '-target arm-linux-androideabi',
3892 '-mllvm -arm-enable-ehabi',
3895 ], 3893 ],
3896 'ldflags': [ 3894 'ldflags': [
3897 '-target arm-linux-androideabi', 3895 '-target arm-linux-androideabi',
3898 ], 3896 ],
3899 }], 3897 }],
3900 ['target_arch=="ia32"', { 3898 ['target_arch=="ia32"', {
3901 'cflags': [ 3899 'cflags': [
3902 '-target x86-linux-androideabi', 3900 '-target x86-linux-androideabi',
3903 ], 3901 ],
3904 'ldflags': [ 3902 'ldflags': [
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
4164 # also contain a default: branch. Chrome is full of that. 4162 # also contain a default: branch. Chrome is full of that.
4165 '-Wno-covered-switch-default', 4163 '-Wno-covered-switch-default',
4166 4164
4167 # Warns when a const char[] is converted to bool. 4165 # Warns when a const char[] is converted to bool.
4168 '-Wstring-conversion', 4166 '-Wstring-conversion',
4169 4167
4170 # Clang considers the `register` keyword as deprecated, but 4168 # Clang considers the `register` keyword as deprecated, but
4171 # e.g. code generated by flex (used in angle) contains that 4169 # e.g. code generated by flex (used in angle) contains that
4172 # keyword. http://crbug.com/255186 4170 # keyword. http://crbug.com/255186
4173 '-Wno-deprecated-register', 4171 '-Wno-deprecated-register',
4174
4175 # TODO(thakis): Remove, http://crbug.com/341352
4176 '-Wno-absolute-value',
4177 ], 4172 ],
4178 4173
4179 'conditions': [ 4174 'conditions': [
4180 ['clang_xcode==0', { 4175 ['clang_xcode==0', {
4181 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 4176 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
4182 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 4177 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
4183 }], 4178 }],
4184 ], 4179 ],
4185 }], 4180 }],
4186 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { 4181 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
4806 '-Wno-extra-tokens', 4801 '-Wno-extra-tokens',
4807 '-Wno-ignored-attributes', 4802 '-Wno-ignored-attributes',
4808 '-Wno-incompatible-pointer-types', 4803 '-Wno-incompatible-pointer-types',
4809 '-Wno-int-to-void-pointer-cast', 4804 '-Wno-int-to-void-pointer-cast',
4810 '-Wno-invalid-noreturn', 4805 '-Wno-invalid-noreturn',
4811 '-Wno-logical-op-parentheses', 4806 '-Wno-logical-op-parentheses',
4812 '-Wno-microsoft', 4807 '-Wno-microsoft',
4813 '-Wno-missing-braces', 4808 '-Wno-missing-braces',
4814 '-Wno-missing-declarations', 4809 '-Wno-missing-declarations',
4815 '-Wno-msvc-include', 4810 '-Wno-msvc-include',
4816 '-Wno-absolute-value',
4817 '-Wno-null-dereference', 4811 '-Wno-null-dereference',
4818 '-Wno-overloaded-virtual', 4812 '-Wno-overloaded-virtual',
4819 '-Wno-parentheses', 4813 '-Wno-parentheses',
4820 '-Wno-pointer-sign', 4814 '-Wno-pointer-sign',
4821 '-Wno-reorder', 4815 '-Wno-reorder',
4822 '-Wno-return-type-c-linkage', 4816 '-Wno-return-type-c-linkage',
4823 '-Wno-self-assign', 4817 '-Wno-self-assign',
4824 '-Wno-sometimes-uninitialized', 4818 '-Wno-sometimes-uninitialized',
4825 '-Wno-switch', 4819 '-Wno-switch',
4826 '-Wno-tautological-compare', 4820 '-Wno-tautological-compare',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5064 # settings in target dicts. SYMROOT is a special case, because many other 5058 # settings in target dicts. SYMROOT is a special case, because many other
5065 # Xcode variables depend on it, including variables such as 5059 # Xcode variables depend on it, including variables such as
5066 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5060 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5067 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5061 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5068 # files to appear (when present) in the UI as actual files and not red 5062 # files to appear (when present) in the UI as actual files and not red
5069 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5063 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5070 # and therefore SYMROOT, needs to be set at the project level. 5064 # and therefore SYMROOT, needs to be set at the project level.
5071 'SYMROOT': '<(DEPTH)/xcodebuild', 5065 'SYMROOT': '<(DEPTH)/xcodebuild',
5072 }, 5066 },
5073 } 5067 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698