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

Side by Side Diff: tools/gyp/v8.gyp

Issue 23710002: Revert "Cross-compiling from Linux to Android requires -lrt for the host toolset.", "Fix Visual Stu… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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 | « test/cctest/test-time.cc ('k') | 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 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 '../../src/objects-visiting.cc', 429 '../../src/objects-visiting.cc',
430 '../../src/objects-visiting.h', 430 '../../src/objects-visiting.h',
431 '../../src/objects.cc', 431 '../../src/objects.cc',
432 '../../src/objects.h', 432 '../../src/objects.h',
433 '../../src/once.cc', 433 '../../src/once.cc',
434 '../../src/once.h', 434 '../../src/once.h',
435 '../../src/optimizing-compiler-thread.h', 435 '../../src/optimizing-compiler-thread.h',
436 '../../src/optimizing-compiler-thread.cc', 436 '../../src/optimizing-compiler-thread.cc',
437 '../../src/parser.cc', 437 '../../src/parser.cc',
438 '../../src/parser.h', 438 '../../src/parser.h',
439 '../../src/platform/elapsed-timer.h',
440 '../../src/platform/time.cc',
441 '../../src/platform/time.h',
442 '../../src/platform-posix.h', 439 '../../src/platform-posix.h',
443 '../../src/platform.h', 440 '../../src/platform.h',
444 '../../src/preparse-data-format.h', 441 '../../src/preparse-data-format.h',
445 '../../src/preparse-data.cc', 442 '../../src/preparse-data.cc',
446 '../../src/preparse-data.h', 443 '../../src/preparse-data.h',
447 '../../src/preparser.cc', 444 '../../src/preparser.cc',
448 '../../src/preparser.h', 445 '../../src/preparser.h',
449 '../../src/prettyprinter.cc', 446 '../../src/prettyprinter.cc',
450 '../../src/prettyprinter.h', 447 '../../src/prettyprinter.h',
451 '../../src/profile-generator-inl.h', 448 '../../src/profile-generator-inl.h',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 }], 681 }],
685 ['OS=="linux"', { 682 ['OS=="linux"', {
686 'link_settings': { 683 'link_settings': {
687 'conditions': [ 684 'conditions': [
688 ['v8_compress_startup_data=="bz2"', { 685 ['v8_compress_startup_data=="bz2"', {
689 'libraries': [ 686 'libraries': [
690 '-lbz2', 687 '-lbz2',
691 ] 688 ]
692 }], 689 }],
693 ], 690 ],
694 'libraries': [
695 '-lrt'
696 ]
697 }, 691 },
698 'sources': [ ### gcmole(os:linux) ### 692 'sources': [ ### gcmole(os:linux) ###
699 '../../src/platform-linux.cc', 693 '../../src/platform-linux.cc',
700 '../../src/platform-posix.cc' 694 '../../src/platform-posix.cc'
701 ], 695 ],
702 } 696 }
703 ], 697 ],
704 ['OS=="android"', { 698 ['OS=="android"', {
705 'defines': [ 699 'defines': [
706 'CAN_USE_VFP_INSTRUCTIONS', 700 'CAN_USE_VFP_INSTRUCTIONS',
707 ], 701 ],
708 'sources': [ 702 'sources': [
709 '../../src/platform-posix.cc' 703 '../../src/platform-posix.cc',
710 ], 704 ],
711 'conditions': [ 705 'conditions': [
712 ['host_os=="mac"', { 706 ['host_os=="mac"', {
713 'target_conditions': [ 707 'target_conditions': [
714 ['_toolset=="host"', { 708 ['_toolset=="host"', {
715 'sources': [ 709 'sources': [
716 '../../src/platform-macos.cc' 710 '../../src/platform-macos.cc'
717 ] 711 ]
718 }, { 712 }, {
719 'sources': [ 713 'sources': [
720 '../../src/platform-linux.cc' 714 '../../src/platform-linux.cc'
721 ] 715 ]
722 }], 716 }],
723 ], 717 ],
724 }, { 718 }, {
725 'link_settings': {
726 'target_conditions': [
727 ['_toolset=="host"', {
728 'libraries': [
729 '-lrt'
730 ]
731 }]
732 ]
733 },
734 'sources': [ 719 'sources': [
735 '../../src/platform-linux.cc' 720 '../../src/platform-linux.cc'
736 ] 721 ]
737 }], 722 }],
738 ], 723 ],
739 }, 724 },
740 ], 725 ],
741 ['OS=="freebsd"', { 726 ['OS=="freebsd"', {
742 'link_settings': { 727 'link_settings': {
743 'libraries': [ 728 'libraries': [
(...skipping 27 matching lines...) Expand all
771 ], 756 ],
772 } 757 }
773 ], 758 ],
774 ['OS=="solaris"', { 759 ['OS=="solaris"', {
775 'link_settings': { 760 'link_settings': {
776 'libraries': [ 761 'libraries': [
777 '-lsocket -lnsl', 762 '-lsocket -lnsl',
778 ]}, 763 ]},
779 'sources': [ 764 'sources': [
780 '../../src/platform-solaris.cc', 765 '../../src/platform-solaris.cc',
781 '../../src/platform-posix.cc' 766 '../../src/platform-posix.cc',
782 ], 767 ],
783 } 768 }
784 ], 769 ],
785 ['OS=="mac"', { 770 ['OS=="mac"', {
786 'sources': [ 771 'sources': [
787 '../../src/platform-macos.cc', 772 '../../src/platform-macos.cc',
788 '../../src/platform-posix.cc' 773 '../../src/platform-posix.cc'
789 ]}, 774 ]},
790 ], 775 ],
791 ['OS=="win"', { 776 ['OS=="win"', {
792 'variables': { 777 'variables': {
793 'gyp_generators': '<!(echo $GYP_GENERATORS)', 778 'gyp_generators': '<!(echo $GYP_GENERATORS)',
794 }, 779 },
795 'conditions': [ 780 'conditions': [
796 ['gyp_generators=="make"', { 781 ['gyp_generators=="make"', {
797 'variables': { 782 'variables': {
798 'build_env': '<!(uname -o)', 783 'build_env': '<!(uname -o)',
799 }, 784 },
800 'conditions': [ 785 'conditions': [
801 ['build_env=="Cygwin"', { 786 ['build_env=="Cygwin"', {
802 'sources': [ 787 'sources': [
803 '../../src/platform-cygwin.cc', 788 '../../src/platform-cygwin.cc',
804 '../../src/platform-posix.cc' 789 '../../src/platform-posix.cc',
805 ], 790 ],
806 }, { 791 }, {
807 'sources': [ 792 'sources': [
808 '../../src/platform-win32.cc', 793 '../../src/platform-win32.cc',
794 '../../src/win32-math.h',
809 '../../src/win32-math.cc', 795 '../../src/win32-math.cc',
810 '../../src/win32-math.h'
811 ], 796 ],
812 }], 797 }],
813 ], 798 ],
814 'link_settings': { 799 'link_settings': {
815 'libraries': [ '-lwinmm', '-lws2_32' ], 800 'libraries': [ '-lwinmm', '-lws2_32' ],
816 }, 801 },
817 }, { 802 }, {
818 'sources': [ 803 'sources': [
819 '../../src/platform-win32.cc', 804 '../../src/platform-win32.cc',
805 '../../src/win32-math.h',
820 '../../src/win32-math.cc', 806 '../../src/win32-math.cc',
821 '../../src/win32-math.h'
822 ], 807 ],
823 'msvs_disabled_warnings': [4351, 4355, 4800], 808 'msvs_disabled_warnings': [4351, 4355, 4800],
824 'link_settings': { 809 'link_settings': {
825 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ], 810 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
826 }, 811 },
827 }], 812 }],
828 ], 813 ],
829 }], 814 }],
830 ['component=="shared_library"', { 815 ['component=="shared_library"', {
831 'defines': [ 816 'defines': [
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 }], 1033 }],
1049 ['v8_compress_startup_data=="bz2"', { 1034 ['v8_compress_startup_data=="bz2"', {
1050 'libraries': [ 1035 'libraries': [
1051 '-lbz2', 1036 '-lbz2',
1052 ] 1037 ]
1053 }], 1038 }],
1054 ], 1039 ],
1055 }, 1040 },
1056 ], 1041 ],
1057 } 1042 }
OLDNEW
« no previous file with comments | « test/cctest/test-time.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698