diff options
| author | Steve Block <steveblock@google.com> | 2011-06-01 17:21:15 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-03 11:43:37 +0100 |
| commit | fa4227f111e3c9144a875e38d3d096b46d80b14c (patch) | |
| tree | 3b52cd23b35fbe799bc3fd98e810840a26ad046c /src/SConscript | |
| parent | 1bd4c0fcb5dd28e4f241037f9748b12f4bc731a1 (diff) | |
| download | android_external_v8-fa4227f111e3c9144a875e38d3d096b46d80b14c.tar.gz android_external_v8-fa4227f111e3c9144a875e38d3d096b46d80b14c.tar.bz2 android_external_v8-fa4227f111e3c9144a875e38d3d096b46d80b14c.zip | |
Update V8 to r7427: Fix ENABLE_LOGGING_AND_PROFILING guards
Partial cherry-pick of
http://code.google.com/p/v8/source/detail?r=8113 pulled into trunk in
http://code.google.com/p/v8/source/detail?r=8130
We can't cherry-pick the entire change because it touches code we
don't yet have. The change to top.cc is taken from the patch for
isolate.cc, to where this code has now moved.
Change-Id: I06a98ff82221a5a9bf64253f7dc5730a2ba603a6
Diffstat (limited to 'src/SConscript')
| -rwxr-xr-x | src/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript index 3b9968ee..a740584c 100755 --- a/src/SConscript +++ b/src/SConscript @@ -329,7 +329,10 @@ def ConfigureObjectFiles(): env.Replace(**context.flags['v8']) context.ApplyEnvOverrides(env) env['BUILDERS']['JS2C'] = Builder(action=js2c.JS2C) - env['BUILDERS']['Snapshot'] = Builder(action='$SOURCE $TARGET --logfile "$LOGFILE" --log-snapshot-positions') + if 'ENABLE_LOGGING_AND_PROFILING' in env['CPPDEFINES']: + env['BUILDERS']['Snapshot'] = Builder(action='$SOURCE $TARGET --logfile "$LOGFILE" --log-snapshot-positions') + else: + env['BUILDERS']['Snapshot'] = Builder(action='$SOURCE $TARGET') # Build the standard platform-independent source files. source_files = context.GetRelevantSources(SOURCES) |