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

Side by Side Diff: src/SConscript

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 | « SConstruct ('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 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 dtoa_env = env.Copy() 143 dtoa_env = env.Copy()
144 dtoa_env.Replace(**context.flags['dtoa']) 144 dtoa_env.Replace(**context.flags['dtoa'])
145 dtoa_files = ['dtoa-config.c'] 145 dtoa_files = ['dtoa-config.c']
146 dtoa_obj = context.ConfigureObject(dtoa_env, dtoa_files) 146 dtoa_obj = context.ConfigureObject(dtoa_env, dtoa_files)
147 147
148 source_objs = context.ConfigureObject(env, source_files) 148 source_objs = context.ConfigureObject(env, source_files)
149 non_snapshot_files = [jscre_obj, dtoa_obj, source_objs] 149 non_snapshot_files = [jscre_obj, dtoa_obj, source_objs]
150 150
151 # Create snapshot if necessary. 151 # Create snapshot if necessary.
152 empty_snapshot_obj = context.ConfigureObject(env, 'snapshot-empty.cc') 152 empty_snapshot_obj = context.ConfigureObject(env, 'snapshot-empty.cc')
153 mksnapshot_env = env.Copy()
154 mksnapshot_env.Replace(**context.flags['mksnapshot'])
153 mksnapshot_src = 'mksnapshot.cc' 155 mksnapshot_src = 'mksnapshot.cc'
154 mksnapshot = env.Program('mksnapshot', [mksnapshot_src, libraries_obj, non_sna pshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb') 156 mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_o bj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb')
155 if context.use_snapshot: 157 if context.use_snapshot:
156 if context.build_snapshot: 158 if context.build_snapshot:
157 snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapsh ot.log').abspath) 159 snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapsh ot.log').abspath)
158 else: 160 else:
159 snapshot_cc = Command('snapshot.cc', [], []) 161 snapshot_cc = Command('snapshot.cc', [], [])
160 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.']) 162 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.'])
161 libraries_obj = context.ConfigureObject(env, libraries_empty_src, CPPPATH=[' .']) 163 libraries_obj = context.ConfigureObject(env, libraries_empty_src, CPPPATH=[' .'])
162 else: 164 else:
163 snapshot_obj = empty_snapshot_obj 165 snapshot_obj = empty_snapshot_obj
164 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] 166 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj]
165 return (library_objs, d8_objs, [mksnapshot]) 167 return (library_objs, d8_objs, [mksnapshot])
166 168
167 169
168 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles() 170 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles()
169 Return('library_objs d8_objs mksnapshot') 171 Return('library_objs d8_objs mksnapshot')
OLDNEW
« no previous file with comments | « SConstruct ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698