commit b26c50a70863498de657ad44be2cffa49ccdcbea
author ager@chromium.org <ager@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Fri Mar 26 09:27:16 2010 +0000
committer ager@chromium.org <ager@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Fri Mar 26 09:27:16 2010 +0000
tree cab0a68fa5a3bf813ded05d16b71e87973221f21
parent 947552dd054a3b8897408ecfbe73c91e679afcdf

Push version 2.1.10 to trunk.

Fixed scons build issues.

Fixed a couple of minor bugs.


git-svn-id: http://v8.googlecode.com/svn/trunk@4294 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

SConstruct

diff --git a/SConstruct b/SConstruct
index bef64eb..d33b567 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1009,7 +1009,6 @@
 
   # Link the object files into a library.
   env.Replace(**context.flags['v8'])
-  env.Prepend(LIBS=[library_name])
 
   context.ApplyEnvOverrides(env)
   if context.options['library'] == 'static':
@@ -1044,7 +1043,9 @@
     sample_env.Depends(sample_program, library)
     context.sample_targets.append(sample_program)
 
-  cctest_program = env.SConscript(
+  cctest_env = env.Copy()
+  cctest_env.Prepend(LIBS=[library_name])
+  cctest_program = cctest_env.SConscript(
     join('test', 'cctest', 'SConscript'),
     build_dir=join('obj', 'test', target_id),
     exports='context object_files',