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

Side by Side Diff: gyp/common_conditions.gypi

Issue 879803003: Revert of Build in C++11 mode on Unix-like bots. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 '-g', 209 '-g',
210 '-fno-exceptions', 210 '-fno-exceptions',
211 '-fstrict-aliasing', 211 '-fstrict-aliasing',
212 212
213 '-Wall', 213 '-Wall',
214 '-Wextra', 214 '-Wextra',
215 '-Winit-self', 215 '-Winit-self',
216 '-Wpointer-arith', 216 '-Wpointer-arith',
217 '-Wsign-compare', 217 '-Wsign-compare',
218 218
219 '-Wno-c++11-extensions',
219 '-Wno-unused-parameter', 220 '-Wno-unused-parameter',
220 ], 221 ],
221 'cflags_cc': [ 222 'cflags_cc': [
222 '-std=c++11',
223 '-fno-rtti', 223 '-fno-rtti',
224 '-Wnon-virtual-dtor', 224 '-Wnon-virtual-dtor',
225 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD. 225 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD.
226 ], 226 ],
227 'conditions': [ 227 'conditions': [
228 [ 'skia_os != "chromeos"', { 228 [ 'skia_os != "chromeos"', {
229 'conditions': [ 229 'conditions': [
230 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 230 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
231 'cflags': [ 231 'cflags': [
232 '-m64', 232 '-m64',
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 [ 'skia_sanitizer == "thread"', { 472 [ 'skia_sanitizer == "thread"', {
473 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], 473 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
474 }], 474 }],
475 [ 'skia_sanitizer == "undefined"', { 475 [ 'skia_sanitizer == "undefined"', {
476 'cflags_cc!': ['-fno-rtti'], 476 'cflags_cc!': ['-fno-rtti'],
477 }], 477 }],
478 ], 478 ],
479 }], 479 }],
480 [ 'skia_clang_build', { 480 [ 'skia_clang_build', {
481 'cflags_cc': [ 481 'cflags_cc': [
482 # Build in C++11 mode to make sure we'll have an easy time switc hing.
483 '-std=c++11',
482 '-Wno-unknown-warning-option', # Allows unknown warnings. 484 '-Wno-unknown-warning-option', # Allows unknown warnings.
483 '-Wno-deprecated', # From Qt, via debugger (older C lang). 485 '-Wno-deprecated', # From Qt, via debugger (older C lang).
484 '-Wno-deprecated-register', # From Qt, via debugger (newer C lang). 486 '-Wno-deprecated-register', # From Qt, via debugger (newer C lang).
485 ], 487 ],
486 'cflags': [ 488 'cflags': [
487 # Extra warnings we like but that only Clang knows about. 489 # Extra warnings we like but that only Clang knows about.
488 '-Wstring-conversion', 490 '-Wstring-conversion',
489 ], 491 ],
490 'cflags!': [ 492 'cflags!': [
491 '-mfpmath=sse', # Clang doesn't need to be told this, and somet imes gets confused. 493 '-mfpmath=sse', # Clang doesn't need to be told this, and somet imes gets confused.
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 [ 'skia_is_bot', { 656 [ 'skia_is_bot', {
655 'defines': [ 'SK_CRASH_HANDLER' ], 657 'defines': [ 'SK_CRASH_HANDLER' ],
656 }], 658 }],
657 659
658 ], # end 'conditions' 660 ], # end 'conditions'
659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
660 'xcode_settings': { 662 'xcode_settings': {
661 'SYMROOT': '<(DEPTH)/xcodebuild', 663 'SYMROOT': '<(DEPTH)/xcodebuild',
662 }, 664 },
663 } 665 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698