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

Side by Side Diff: gyp/common_conditions.gypi

Issue 361723002: Have Clang builders build in C++11 mode. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: try again Created 6 years, 5 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 | « bench/MemoryBench.cpp ('k') | gyp/libwebp.gyp » ('j') | 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_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 'target_conditions': [ 467 'target_conditions': [
468 [ '_type == "executable"', { 468 [ '_type == "executable"', {
469 'cflags': [ '-fPIE' ], 469 'cflags': [ '-fPIE' ],
470 'ldflags': [ '-pie' ], 470 'ldflags': [ '-pie' ],
471 }], 471 }],
472 ], 472 ],
473 }], 473 }],
474 ], 474 ],
475 }], 475 }],
476 [ 'skia_clang_build', { 476 [ 'skia_clang_build', {
477 'cflags_cc': [
478 # Build in C++11 mode to make sure we'll have an easy time switc hing.
479 '-std=c++11',
480 '-Wno-unknown-warning-option', # Allows unknown warnings.
481 '-Wno-deprecated', # From Qt, via debugger (older C lang).
482 '-Wno-deprecated-register', # From Qt, via debugger (newer C lang).
483 ],
477 'cflags': [ 484 'cflags': [
478 # Extra warnings we like but that only Clang knows about. 485 # Extra warnings we like but that only Clang knows about.
479 '-Wstring-conversion', 486 '-Wstring-conversion',
480 ], 487 ],
481 'cflags!': [ 488 'cflags!': [
482 '-mfpmath=sse', # Clang doesn't need to be told this, and somet imes gets confused. 489 '-mfpmath=sse', # Clang doesn't need to be told this, and somet imes gets confused.
483 ], 490 ],
484 }], 491 }],
485 [ 'skia_keep_frame_pointer', { 492 [ 'skia_keep_frame_pointer', {
486 'cflags': [ '-fno-omit-frame-pointer' ], 493 'cflags': [ '-fno-omit-frame-pointer' ],
487 }], 494 }],
488 ], 495 ],
489 }, 496 },
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 696 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
690 ], 697 ],
691 }], 698 }],
692 699
693 ], # end 'conditions' 700 ], # end 'conditions'
694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 701 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
695 'xcode_settings': { 702 'xcode_settings': {
696 'SYMROOT': '<(DEPTH)/xcodebuild', 703 'SYMROOT': '<(DEPTH)/xcodebuild',
697 }, 704 },
698 } 705 }
OLDNEW
« no previous file with comments | « bench/MemoryBench.cpp ('k') | gyp/libwebp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698