Land change to allow building on Gentoo Hardened Linux.

Codereview URL: http://codereview.chromium.org/659002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3940 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/AUTHORS b/AUTHORS
index 8b0db5c..b79335a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,3 +24,4 @@ Ryan Dahl <coldredlemur@gmail.com>
 Patrick Gansterer <paroga@paroga.com>
 Subrato K De <subratokde@codeaurora.org>
 Dineel D Sule <dsule@codeaurora.org>
+Pawel Hajdan jr <phajdan.jr@gmail.com>

diff --git a/src/SConscript b/src/SConscript
index 73de193..962a4b5 100755 (executable)
--- a/src/SConscript
+++ b/src/SConscript
@@ -298,6 +298,13 @@ def ConfigureObjectFiles():
   mksnapshot_env.Replace(**context.flags['mksnapshot'])
   mksnapshot_src = 'mksnapshot.cc'
   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.build_snapshot:
       snapshot_cc = env.Snapshot('snapshot.cc', mksnapshot, LOGFILE=File('snapshot.log').abspath)
@@ -306,6 +313,7 @@ def ConfigureObjectFiles():
     snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.'])
   else:
     snapshot_obj = empty_snapshot_obj
+
   library_objs = [non_snapshot_files, libraries_obj, snapshot_obj]
   return (library_objs, d8_objs, [mksnapshot])