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

Side by Side Diff: gyp/common_conditions.gypi

Issue 440643004: Don't call out -lstdc++ -lm explicitly. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 '-lppapi', 429 '-lppapi',
430 '-lppapi_cpp', 430 '-lppapi_cpp',
431 '-lnosys', 431 '-lnosys',
432 '-pthread', 432 '-pthread',
433 ], 433 ],
434 'ldflags': [ 434 'ldflags': [
435 '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release', 435 '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release',
436 '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Rele ase', 436 '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Rele ase',
437 ], 437 ],
438 }, 438 },
439 }, { # skia_os != "nacl"
440 'link_settings': {
441 'ldflags': [
442 '-lstdc++',
443 '-lm',
444 ],
445 },
446 }], 439 }],
447 # Enable asan, tsan, etc. 440 # Enable asan, tsan, etc.
448 [ 'skia_sanitizer', { 441 [ 'skia_sanitizer', {
449 'cflags': [ 442 'cflags': [
450 '-fsanitize=<(skia_sanitizer)', 443 '-fsanitize=<(skia_sanitizer)',
451 ], 444 ],
452 'ldflags': [ 445 'ldflags': [
453 '-fsanitize=<(skia_sanitizer)', 446 '-fsanitize=<(skia_sanitizer)',
454 ], 447 ],
455 'conditions' : [ 448 'conditions' : [
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 'configurations': { 624 'configurations': {
632 'Debug': { 625 'Debug': {
633 'cflags': ['-g'] 626 'cflags': ['-g']
634 }, 627 },
635 'Release': { 628 'Release': {
636 'cflags': ['-O2'], 629 'cflags': ['-O2'],
637 'defines': [ 'NDEBUG' ], 630 'defines': [ 'NDEBUG' ],
638 }, 631 },
639 }, 632 },
640 'libraries': [ 633 'libraries': [
641 '-lstdc++',
642 '-lm',
643 '-llog', 634 '-llog',
644 ], 635 ],
645 'cflags': [ 636 'cflags': [
646 '-fuse-ld=gold', 637 '-fuse-ld=gold',
647 ], 638 ],
648 'conditions': [ 639 'conditions': [
649 [ 'skia_arch_type == "x86"', { 640 [ 'skia_arch_type == "x86"', {
650 'cflags': [ 641 'cflags': [
651 '-mssse3', 642 '-mssse3',
652 ], 643 ],
653 }], 644 }],
654 [ 'skia_android_framework', { 645 [ 'skia_android_framework', {
655 'libraries!': [
656 '-lstdc++',
657 '-lm',
658 ],
659 'cflags!': [ 646 'cflags!': [
660 '-fuse-ld=gold', 647 '-fuse-ld=gold',
661 ], 648 ],
662 }], 649 }],
663 [ 'skia_shared_lib', { 650 [ 'skia_shared_lib', {
664 'defines': [ 651 'defines': [
665 'SKIA_DLL', 652 'SKIA_DLL',
666 'SKIA_IMPLEMENTATION=1', 653 'SKIA_IMPLEMENTATION=1',
667 # Needed until we fix skbug.com/2440. 654 # Needed until we fix skbug.com/2440.
668 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 655 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
(...skipping 23 matching lines...) Expand all
692 [ 'skia_crash_handler', { 679 [ 'skia_crash_handler', {
693 'defines': [ 'SK_CRASH_HANDLER' ], 680 'defines': [ 'SK_CRASH_HANDLER' ],
694 }], 681 }],
695 682
696 ], # end 'conditions' 683 ], # end 'conditions'
697 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 684 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
698 'xcode_settings': { 685 'xcode_settings': {
699 'SYMROOT': '<(DEPTH)/xcodebuild', 686 'SYMROOT': '<(DEPTH)/xcodebuild',
700 }, 687 },
701 } 688 }
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