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

Side by Side Diff: src/SConscript

Issue 661071: Revert pax change as it does not work with older versions of scons. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 10 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 | « AUTHORS ('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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 source_objs = context.ConfigureObject(env, source_files) 292 source_objs = context.ConfigureObject(env, source_files)
293 non_snapshot_files = [dtoa_obj, source_objs] 293 non_snapshot_files = [dtoa_obj, source_objs]
294 294
295 # Create snapshot if necessary. 295 # Create snapshot if necessary.
296 empty_snapshot_obj = context.ConfigureObject(env, 'snapshot-empty.cc') 296 empty_snapshot_obj = context.ConfigureObject(env, 'snapshot-empty.cc')
297 mksnapshot_env = env.Copy() 297 mksnapshot_env = env.Copy()
298 mksnapshot_env.Replace(**context.flags['mksnapshot']) 298 mksnapshot_env.Replace(**context.flags['mksnapshot'])
299 mksnapshot_src = 'mksnapshot.cc' 299 mksnapshot_src = 'mksnapshot.cc'
300 mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_o bj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb') 300 mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_o bj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb')
301
302 # Fix build on Linux systems with PaX enabled, see
303 # http://code.google.com/p/v8/issues/detail?id=607. The dash ("-") at the
304 # beginning of the command makes scons ignore the return code, since
305 # /sbin/paxctl may not be present at all systems (especially non-Linux).
306 mksnapshot_env.AddPostAction(mksnapshot, '-/sbin/paxctl -m ${TARGET}')
307
308 if context.use_snapshot: 301 if context.use_snapshot:
309 if context.build_snapshot: 302 if context.build_snapshot:
310 snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapsh ot.log').abspath) 303 snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapsh ot.log').abspath)
311 else: 304 else:
312 snapshot_cc = Command('snapshot.cc', [], []) 305 snapshot_cc = Command('snapshot.cc', [], [])
313 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.']) 306 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.'])
314 else: 307 else:
315 snapshot_obj = empty_snapshot_obj 308 snapshot_obj = empty_snapshot_obj
316
317 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] 309 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj]
318 return (library_objs, d8_objs, [mksnapshot]) 310 return (library_objs, d8_objs, [mksnapshot])
319 311
320 312
321 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles() 313 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles()
322 Return('library_objs d8_objs mksnapshot') 314 Return('library_objs d8_objs mksnapshot')
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698