summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-02-15 15:31:19 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-02-16 18:02:01 +0000
commit9f9d6481ded31d33ae62a53f6eaeeef27a8f0ca4 (patch)
treedf904e632757758a6cb9c1c062af57c7ab6e8aba
parent2a2b156ea5ec40110b9e66ba9ccc7d6f3a314723 (diff)
scons: Avoid depending on scons 2.0 in general.
-rw-r--r--SConstruct6
1 files changed, 5 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 96dc09a422..8607d2cd8e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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')
#######################################################################