scons: Avoid depending on scons 2.0 in general.
authorJosé Fonseca <jfonseca@vmware.com>
Tue, 15 Feb 2011 15:31:19 +0000 (15:31 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 16 Feb 2011 18:02:01 +0000 (18:02 +0000)
SConstruct

index 96dc09a4220eb53beb77c742c6ba8e486acc7cdf..8607d2cd8e0ab726039d02202e067c158ae75ff4 100644 (file)
@@ -153,7 +153,9 @@ if env['crosscompile'] and env['platform'] != 'embedded':
     if host_env['msvc']:
         host_env.Append(CPPPATH = ['#include/c99'])
 
-    Export(env = host_env)
+    target_env = env
+    env = host_env
+    Export('env')
 
     SConscript(
         'src/SConscript',
@@ -161,6 +163,8 @@ if env['crosscompile'] and env['platform'] != 'embedded':
         duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
     )
 
+    env = target_env
+
 Export('env')
 
 #######################################################################