Commit fc382f0f authored by ager@chromium.org's avatar ager@chromium.org

Revert pax change as it does not work with older versions of scons.

Review URL: http://codereview.chromium.org/661071

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3946 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4b6b2dc9
...@@ -24,4 +24,3 @@ Ryan Dahl <coldredlemur@gmail.com> ...@@ -24,4 +24,3 @@ Ryan Dahl <coldredlemur@gmail.com>
Patrick Gansterer <paroga@paroga.com> Patrick Gansterer <paroga@paroga.com>
Subrato K De <subratokde@codeaurora.org> Subrato K De <subratokde@codeaurora.org>
Dineel D Sule <dsule@codeaurora.org> Dineel D Sule <dsule@codeaurora.org>
Pawel Hajdan jr <phajdan.jr@gmail.com>
...@@ -298,13 +298,6 @@ def ConfigureObjectFiles(): ...@@ -298,13 +298,6 @@ def ConfigureObjectFiles():
mksnapshot_env.Replace(**context.flags['mksnapshot']) mksnapshot_env.Replace(**context.flags['mksnapshot'])
mksnapshot_src = 'mksnapshot.cc' mksnapshot_src = 'mksnapshot.cc'
mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_obj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb') mksnapshot = mksnapshot_env.Program('mksnapshot', [mksnapshot_src, libraries_obj, non_snapshot_files, empty_snapshot_obj], PDB='mksnapshot.exe.pdb')
# Fix build on Linux systems with PaX enabled, see
# http://code.google.com/p/v8/issues/detail?id=607. The dash ("-") at the
# beginning of the command makes scons ignore the return code, since
# /sbin/paxctl may not be present at all systems (especially non-Linux).
mksnapshot_env.AddPostAction(mksnapshot, '-/sbin/paxctl -m ${TARGET}')
if context.use_snapshot: if context.use_snapshot:
if context.build_snapshot: if context.build_snapshot:
snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapshot.log').abspath) snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapshot.log').abspath)
...@@ -313,7 +306,6 @@ def ConfigureObjectFiles(): ...@@ -313,7 +306,6 @@ def ConfigureObjectFiles():
snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.']) snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.'])
else: else:
snapshot_obj = empty_snapshot_obj snapshot_obj = empty_snapshot_obj
library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] library_objs = [non_snapshot_files, libraries_obj, snapshot_obj]
return (library_objs, d8_objs, [mksnapshot]) return (library_objs, d8_objs, [mksnapshot])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment