diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
| commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
| tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /mesalib/SConstruct | |
| parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/SConstruct')
| -rw-r--r-- | mesalib/SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 269715637..7773719af 100644 --- a/mesalib/SConstruct +++ b/mesalib/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')
#######################################################################
|