From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 15 Feb 2011 15:31:19 +0000 (+0000)
Subject: scons: Avoid depending on scons 2.0 in general.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f9d6481ded31d33ae62a53f6eaeeef27a8f0ca4;p=mesa.git

scons: Avoid depending on scons 2.0 in general.
---

diff --git a/SConstruct b/SConstruct
index 96dc09a4220..8607d2cd8e0 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')
 
 #######################################################################