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

Side by Side Diff: SConstruct

Issue 7283039: Fix SConstruct to pass correct defines to samples/preparser when building with library=shared. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | samples/shell.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 2011 the V8 project authors. All rights reserved. 1 # Copyright 2011 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 'all': { 393 'all': {
394 'WARNINGFLAGS': ['/WX', '/wd4018', '/wd4244'] 394 'WARNINGFLAGS': ['/WX', '/wd4018', '/wd4244']
395 } 395 }
396 } 396 }
397 } 397 }
398 398
399 399
400 CCTEST_EXTRA_FLAGS = { 400 CCTEST_EXTRA_FLAGS = {
401 'all': { 401 'all': {
402 'CPPPATH': [join(root_dir, 'src')], 402 'CPPPATH': [join(root_dir, 'src')],
403 'library:shared': {
404 'CPPDEFINES': ['USING_V8_SHARED']
405 },
403 }, 406 },
404 'gcc': { 407 'gcc': {
405 'all': { 408 'all': {
406 'LIBPATH': [abspath('.')], 409 'LIBPATH': [abspath('.')],
407 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], 410 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'],
408 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'], 411 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'],
409 'LINKFLAGS': ['$CCFLAGS'], 412 'LINKFLAGS': ['$CCFLAGS'],
410 }, 413 },
411 'os:linux': { 414 'os:linux': {
412 'LIBS': ['pthread'], 415 'LIBS': ['pthread'],
(...skipping 16 matching lines...) Expand all
429 }, 432 },
430 'arch:arm': { 433 'arch:arm': {
431 'LINKFLAGS': ARM_LINK_FLAGS 434 'LINKFLAGS': ARM_LINK_FLAGS
432 }, 435 },
433 }, 436 },
434 'msvc': { 437 'msvc': {
435 'all': { 438 'all': {
436 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], 439 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'],
437 'LIBS': ['winmm', 'ws2_32'] 440 'LIBS': ['winmm', 'ws2_32']
438 }, 441 },
439 'library:shared': {
440 'CPPDEFINES': ['USING_V8_SHARED']
441 },
442 'arch:ia32': { 442 'arch:ia32': {
443 'CPPDEFINES': ['V8_TARGET_ARCH_IA32'] 443 'CPPDEFINES': ['V8_TARGET_ARCH_IA32']
444 }, 444 },
445 'arch:x64': { 445 'arch:x64': {
446 'CPPDEFINES': ['V8_TARGET_ARCH_X64'], 446 'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
447 'LINKFLAGS': ['/STACK:2091752'] 447 'LINKFLAGS': ['/STACK:2091752']
448 }, 448 },
449 } 449 }
450 } 450 }
451 451
452 452
453 SAMPLE_FLAGS = { 453 SAMPLE_FLAGS = {
454 'all': { 454 'all': {
455 'CPPPATH': [join(abspath('.'), 'include')], 455 'CPPPATH': [join(abspath('.'), 'include')],
456 'library:shared': {
457 'CPPDEFINES': ['USING_V8_SHARED']
458 },
456 }, 459 },
457 'gcc': { 460 'gcc': {
458 'all': { 461 'all': {
459 'LIBPATH': ['.'], 462 'LIBPATH': ['.'],
460 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], 463 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'],
461 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'], 464 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'],
462 'LINKFLAGS': ['$CCFLAGS'], 465 'LINKFLAGS': ['$CCFLAGS'],
463 }, 466 },
464 'os:linux': { 467 'os:linux': {
465 'LIBS': ['pthread'], 468 'LIBS': ['pthread'],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 'all': { 568 'all': {
566 'LIBS': ['winmm', 'ws2_32'] 569 'LIBS': ['winmm', 'ws2_32']
567 }, 570 },
568 'verbose:off': { 571 'verbose:off': {
569 'CCFLAGS': ['/nologo'], 572 'CCFLAGS': ['/nologo'],
570 'LINKFLAGS': ['/NOLOGO'] 573 'LINKFLAGS': ['/NOLOGO']
571 }, 574 },
572 'verbose:on': { 575 'verbose:on': {
573 'LINKFLAGS': ['/VERBOSE'] 576 'LINKFLAGS': ['/VERBOSE']
574 }, 577 },
575 'library:shared': {
576 'CPPDEFINES': ['USING_V8_SHARED']
577 },
578 'prof:on': { 578 'prof:on': {
579 'LINKFLAGS': ['/MAP'] 579 'LINKFLAGS': ['/MAP']
580 }, 580 },
581 'mode:release': { 581 'mode:release': {
582 'CCFLAGS': ['/O2'], 582 'CCFLAGS': ['/O2'],
583 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'], 583 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'],
584 'msvcrt:static': { 584 'msvcrt:static': {
585 'CCFLAGS': ['/MT'] 585 'CCFLAGS': ['/MT']
586 }, 586 },
587 'msvcrt:shared': { 587 'msvcrt:shared': {
(...skipping 30 matching lines...) Expand all
618 'msvcrt:shared': { 618 'msvcrt:shared': {
619 'CCFLAGS': ['/MDd'] 619 'CCFLAGS': ['/MDd']
620 } 620 }
621 } 621 }
622 } 622 }
623 } 623 }
624 624
625 625
626 PREPARSER_FLAGS = { 626 PREPARSER_FLAGS = {
627 'all': { 627 'all': {
628 'CPPPATH': [join(abspath('.'), 'include'), join(abspath('.'), 'src')] 628 'CPPPATH': [join(abspath('.'), 'include'), join(abspath('.'), 'src')],
629 'library:shared': {
630 'CPPDEFINES': ['USING_V8_SHARED']
631 },
629 }, 632 },
630 'gcc': { 633 'gcc': {
631 'all': { 634 'all': {
632 'LIBPATH': ['.'], 635 'LIBPATH': ['.'],
633 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'], 636 'CCFLAGS': ['$DIALECTFLAGS', '$WARNINGFLAGS'],
634 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'], 637 'CXXFLAGS': ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'],
635 'LINKFLAGS': ['$CCFLAGS'], 638 'LINKFLAGS': ['$CCFLAGS'],
636 }, 639 },
637 'os:win32': { 640 'os:win32': {
638 'LIBS': ['winmm', 'ws2_32'] 641 'LIBS': ['winmm', 'ws2_32']
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 'all': { 723 'all': {
721 'LIBS': ['winmm', 'ws2_32'] 724 'LIBS': ['winmm', 'ws2_32']
722 }, 725 },
723 'verbose:off': { 726 'verbose:off': {
724 'CCFLAGS': ['/nologo'], 727 'CCFLAGS': ['/nologo'],
725 'LINKFLAGS': ['/NOLOGO'] 728 'LINKFLAGS': ['/NOLOGO']
726 }, 729 },
727 'verbose:on': { 730 'verbose:on': {
728 'LINKFLAGS': ['/VERBOSE'] 731 'LINKFLAGS': ['/VERBOSE']
729 }, 732 },
730 'library:shared': {
731 'CPPDEFINES': ['USING_V8_SHARED']
732 },
733 'prof:on': { 733 'prof:on': {
734 'LINKFLAGS': ['/MAP'] 734 'LINKFLAGS': ['/MAP']
735 }, 735 },
736 'mode:release': { 736 'mode:release': {
737 'CCFLAGS': ['/O2'], 737 'CCFLAGS': ['/O2'],
738 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'], 738 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'],
739 'msvcrt:static': { 739 'msvcrt:static': {
740 'CCFLAGS': ['/MT'] 740 'CCFLAGS': ['/MT']
741 }, 741 },
742 'msvcrt:shared': { 742 'msvcrt:shared': {
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 # version of scons. Also, there's a bug in some revisions that 1480 # version of scons. Also, there's a bug in some revisions that
1481 # doesn't allow this flag to be set, so we swallow any exceptions. 1481 # doesn't allow this flag to be set, so we swallow any exceptions.
1482 # Lovely. 1482 # Lovely.
1483 try: 1483 try:
1484 SetOption('warn', 'no-deprecated') 1484 SetOption('warn', 'no-deprecated')
1485 except: 1485 except:
1486 pass 1486 pass
1487 1487
1488 1488
1489 Build() 1489 Build()
OLDNEW
« no previous file with comments | « no previous file | samples/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698