diff options
Diffstat (limited to 'build/SConscript.v8')
| -rw-r--r-- | build/SConscript.v8 | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 8eeef09..7820f16 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -2,6 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. + +import os + Import('env') # Grab the -j flag from the outer environment, if available. @@ -22,13 +25,16 @@ env = env.Clone( '--warn=no-no-parallel-support' + cpu_flag), ) +if env['PLATFORM'] == 'win32': + env['ENV']['ProgramFiles'] = os.environ['ProgramFiles'] + # Rather than build v8 with our own commands, we just shell out to v8's # own SCons-based build, since their build system is complicated. # This SConscript just declares dependencies on the outputs of that build. mksnapshot_exe = env.File('$V8_MODE_DIR/mksnapshot${PROGSUFFIX}') -libraries_obj = env.File('$V8_MODE_DIR/libraries${OBJSUFFIX}') libraries_empty_obj = env.File('$V8_MODE_DIR/libraries-empty${OBJSUFFIX}') +libraries_obj = env.File('$V8_MODE_DIR/libraries${OBJSUFFIX}') snapshot_obj = env.File('$V8_MODE_DIR/snapshot${OBJSUFFIX}') snapshot_empty_obj = env.File('$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}') v8_bin = env.File('$V8_SRC_DIR/shell${PROGSUFFIX}') @@ -64,20 +70,13 @@ env.AlwaysBuild(v8) # rebuild them (thereby causing us to always rebuild their dependents). env.Precious(v8) -env.Install('$V8_DIR', v8) - - -i = env.Install('$LIBS_DIR', v8_lib) -env.Alias('webkit', i) - -i = env.Install('$TARGET_ROOT', v8_bin) -env.Alias('chrome', i) +# TODO(bradnelson): remove if we confirm we no longer need this. # To satisfy tests expecting the following .exe name. -if env['PLATFORM'] == 'win32': - # TODO(evanm): this may be necessary on other platforms(?) - i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) - env.Alias('chrome', i) +#if env['PLATFORM'] == 'win32': +# # TODO(evanm): this may be necessary on other platforms(?) +# i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) +# env.Alias('chrome', i) env.ChromeStaticLibrary('v8_snapshot', [libraries_empty_obj, snapshot_obj]) |