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

Side by Side Diff: build/common.gypi

Issue 25875004: Roll Clang 188423:191856. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable MultiThreadedCertVerifierTest.CancelRequestThenQuit for LSan Created 7 years, 2 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 | « base/security_unittest.cc ('k') | net/cert/multi_threaded_cert_verifier_unittest.cc » ('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 3117 matching lines...) Expand 10 before | Expand all | Expand 10 after
3128 }], 3128 }],
3129 ['clang==1', { 3129 ['clang==1', {
3130 'cflags!': [ 3130 'cflags!': [
3131 # Clang does not support the following options. 3131 # Clang does not support the following options.
3132 '-mthumb-interwork', 3132 '-mthumb-interwork',
3133 '-finline-limit=64', 3133 '-finline-limit=64',
3134 '-fno-tree-sra', 3134 '-fno-tree-sra',
3135 '-fuse-ld=gold', 3135 '-fuse-ld=gold',
3136 '-Wno-psabi', 3136 '-Wno-psabi',
3137 ], 3137 ],
3138 'ldflags!': [
3139 # Clang does not support the following options.
3140 '-fuse-ld=gold',
3141 ],
3138 }], 3142 }],
3139 ], 3143 ],
3140 }], 3144 }],
3141 ], 3145 ],
3142 }], 3146 }],
3143 ], 3147 ],
3144 }], 3148 }],
3145 ['target_arch=="mipsel"', { 3149 ['target_arch=="mipsel"', {
3146 'target_conditions': [ 3150 'target_conditions': [
3147 ['_toolset=="target"', { 3151 ['_toolset=="target"', {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
3212 # this is worth fixing. 3216 # this is worth fixing.
3213 '-Wno-c++11-narrowing', 3217 '-Wno-c++11-narrowing',
3214 3218
3215 # TODO(thakis): Remove, http://crbug.com/263960 3219 # TODO(thakis): Remove, http://crbug.com/263960
3216 '-Wno-reserved-user-defined-literal', 3220 '-Wno-reserved-user-defined-literal',
3217 3221
3218 # Clang considers the `register` keyword as deprecated, but e.g. 3222 # Clang considers the `register` keyword as deprecated, but e.g.
3219 # code generated by flex (used in angle) contains that keyword. 3223 # code generated by flex (used in angle) contains that keyword.
3220 # http://crbug.com/255186 3224 # http://crbug.com/255186
3221 '-Wno-deprecated-register', 3225 '-Wno-deprecated-register',
3226
3227 # TODO(hans): Remove once we've cleaned up the warnings.
3228 '-Wno-unused-const-variable',
3229
3230 # This warns about auto_ptr<>, used in third-party code.
3231 '-Wno-deprecated-declarations',
3222 ], 3232 ],
3223 'cflags!': [ 3233 'cflags!': [
3224 # Clang doesn't seem to know know this flag. 3234 # Clang doesn't seem to know know this flag.
3225 '-mfpmath=sse', 3235 '-mfpmath=sse',
3226 ], 3236 ],
3227 'cflags_cc': [ 3237 'cflags_cc': [
3228 # See the comment in the Mac section for what it takes to move 3238 # See the comment in the Mac section for what it takes to move
3229 # this to -std=c++11. 3239 # this to -std=c++11.
3230 '-std=gnu++11', 3240 '-std=gnu++11',
3231 ], 3241 ],
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
3915 # also contain a default: branch. Chrome is full of that. 3925 # also contain a default: branch. Chrome is full of that.
3916 '-Wno-covered-switch-default', 3926 '-Wno-covered-switch-default',
3917 3927
3918 # Warns when a const char[] is converted to bool. 3928 # Warns when a const char[] is converted to bool.
3919 '-Wstring-conversion', 3929 '-Wstring-conversion',
3920 3930
3921 # Clang considers the `register` keyword as deprecated, but e.g. 3931 # Clang considers the `register` keyword as deprecated, but e.g.
3922 # code generated by flex (used in angle) contains that keyword. 3932 # code generated by flex (used in angle) contains that keyword.
3923 # http://crbug.com/255186 3933 # http://crbug.com/255186
3924 '-Wno-deprecated-register', 3934 '-Wno-deprecated-register',
3935
3936 # TODO(hans): Remove once we've cleaned up the warnings.
3937 '-Wno-unused-const-variable',
3938
3939 # This warns about auto_ptr<>, used in third-party code.
3940 '-Wno-deprecated-declarations',
3925 ], 3941 ],
3926 }], 3942 }],
3927 ['clang==1 and clang_use_chrome_plugins==1', { 3943 ['clang==1 and clang_use_chrome_plugins==1', {
3928 'OTHER_CFLAGS': [ 3944 'OTHER_CFLAGS': [
3929 '<@(clang_chrome_plugins_flags)', 3945 '<@(clang_chrome_plugins_flags)',
3930 ], 3946 ],
3931 }], 3947 }],
3932 ['clang==1 and clang_load!=""', { 3948 ['clang==1 and clang_load!=""', {
3933 'OTHER_CFLAGS': [ 3949 'OTHER_CFLAGS': [
3934 '-Xclang', '-load', '-Xclang', '<(clang_load)', 3950 '-Xclang', '-load', '-Xclang', '<(clang_load)',
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 # settings in target dicts. SYMROOT is a special case, because many other 4758 # settings in target dicts. SYMROOT is a special case, because many other
4743 # Xcode variables depend on it, including variables such as 4759 # Xcode variables depend on it, including variables such as
4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4760 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4761 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4746 # files to appear (when present) in the UI as actual files and not red 4762 # files to appear (when present) in the UI as actual files and not red
4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4763 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4748 # and therefore SYMROOT, needs to be set at the project level. 4764 # and therefore SYMROOT, needs to be set at the project level.
4749 'SYMROOT': '<(DEPTH)/xcodebuild', 4765 'SYMROOT': '<(DEPTH)/xcodebuild',
4750 }, 4766 },
4751 } 4767 }
OLDNEW
« no previous file with comments | « base/security_unittest.cc ('k') | net/cert/multi_threaded_cert_verifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698