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

Side by Side Diff: SConstruct

Issue 21171: Fix linking of mksnapshot (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | src/SConscript » ('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 2008 the V8 project authors. All rights reserved. 1 # Copyright 2008 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 # used by the arm simulator. 137 # used by the arm simulator.
138 'WARNINGFLAGS': ['/wd4996'] 138 'WARNINGFLAGS': ['/wd4996']
139 }, 139 },
140 'disassembler:on': { 140 'disassembler:on': {
141 'CPPDEFINES': ['ENABLE_DISASSEMBLER'] 141 'CPPDEFINES': ['ENABLE_DISASSEMBLER']
142 } 142 }
143 } 143 }
144 } 144 }
145 145
146 146
147 MKSNAPSHOT_EXTRA_FLAGS = {
148 'gcc': {
149 'os:linux': {
150 'LIBS': ['pthread'],
151 },
152 'os:macos': {
153 'LIBS': ['pthread'],
154 },
155 'os:freebsd': {
156 'LIBS': ['pthread'],
157 },
158 'os:win32': {
159 'LIBS': ['winmm'],
160 },
161 },
162 'msvc': {
163 'all': {
164 'LIBS': ['winmm']
165 }
166 }
167 }
168
169
147 JSCRE_EXTRA_FLAGS = { 170 JSCRE_EXTRA_FLAGS = {
148 'gcc': { 171 'gcc': {
149 'all': { 172 'all': {
150 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'], 173 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'],
151 'WARNINGFLAGS': ['-w'] 174 'WARNINGFLAGS': ['-w']
152 }, 175 },
153 }, 176 },
154 'msvc': { 177 'msvc': {
155 'all': { 178 'all': {
156 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'], 179 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'],
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 def BuildSpecific(env, mode, env_overrides): 556 def BuildSpecific(env, mode, env_overrides):
534 options = {'mode': mode} 557 options = {'mode': mode}
535 for option in SIMPLE_OPTIONS: 558 for option in SIMPLE_OPTIONS:
536 options[option] = env[option] 559 options[option] = env[option]
537 PostprocessOptions(options) 560 PostprocessOptions(options)
538 561
539 context = BuildContext(options, env_overrides, samples=SplitList(env['sample'] )) 562 context = BuildContext(options, env_overrides, samples=SplitList(env['sample'] ))
540 563
541 library_flags = context.AddRelevantFlags(os.environ, LIBRARY_FLAGS) 564 library_flags = context.AddRelevantFlags(os.environ, LIBRARY_FLAGS)
542 v8_flags = context.AddRelevantFlags(library_flags, V8_EXTRA_FLAGS) 565 v8_flags = context.AddRelevantFlags(library_flags, V8_EXTRA_FLAGS)
566 mksnapshot_flags = context.AddRelevantFlags(library_flags, MKSNAPSHOT_EXTRA_FL AGS)
543 jscre_flags = context.AddRelevantFlags(library_flags, JSCRE_EXTRA_FLAGS) 567 jscre_flags = context.AddRelevantFlags(library_flags, JSCRE_EXTRA_FLAGS)
544 dtoa_flags = context.AddRelevantFlags(library_flags, DTOA_EXTRA_FLAGS) 568 dtoa_flags = context.AddRelevantFlags(library_flags, DTOA_EXTRA_FLAGS)
545 cctest_flags = context.AddRelevantFlags(v8_flags, CCTEST_EXTRA_FLAGS) 569 cctest_flags = context.AddRelevantFlags(v8_flags, CCTEST_EXTRA_FLAGS)
546 sample_flags = context.AddRelevantFlags(os.environ, SAMPLE_FLAGS) 570 sample_flags = context.AddRelevantFlags(os.environ, SAMPLE_FLAGS)
547 d8_flags = context.AddRelevantFlags(library_flags, D8_FLAGS) 571 d8_flags = context.AddRelevantFlags(library_flags, D8_FLAGS)
548 572
549 context.flags = { 573 context.flags = {
550 'v8': v8_flags, 574 'v8': v8_flags,
551 'mksnapshot': v8_flags, 575 'mksnapshot': mksnapshot_flags,
552 'jscre': jscre_flags, 576 'jscre': jscre_flags,
553 'dtoa': dtoa_flags, 577 'dtoa': dtoa_flags,
554 'cctest': cctest_flags, 578 'cctest': cctest_flags,
555 'sample': sample_flags, 579 'sample': sample_flags,
556 'd8': d8_flags 580 'd8': d8_flags
557 } 581 }
558 582
559 target_id = mode 583 target_id = mode
560 suffix = SUFFIXES[target_id] 584 suffix = SUFFIXES[target_id]
561 library_name = 'v8' + suffix 585 library_name = 'v8' + suffix
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 # version of scons. Also, there's a bug in some revisions that 679 # version of scons. Also, there's a bug in some revisions that
656 # doesn't allow this flag to be set, so we swallow any exceptions. 680 # doesn't allow this flag to be set, so we swallow any exceptions.
657 # Lovely. 681 # Lovely.
658 try: 682 try:
659 SetOption('warn', 'no-deprecated') 683 SetOption('warn', 'no-deprecated')
660 except: 684 except:
661 pass 685 pass
662 686
663 687
664 Build() 688 Build()
OLDNEW
« no previous file with comments | « no previous file | src/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698