Merge remote-tracking branch 'x86/froyo-x86' into froyo-next

[android-x86/external-mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 96dc09a..8607d2c 100644 (file)
--- 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')
 
 #######################################################################