From c8e904e159e6ddfe68fa5dc4de72b12eb7b7747d Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 4 Mar 2011 14:29:06 +0000
Subject: scons: Unbreak mingw cross compilation.

---
 src/glsl/SConscript | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/glsl/SConscript')

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index ef10ca9751e..9ecc155c9c9 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -102,16 +102,16 @@ if env['msvc']:
     env.Prepend(CPPPATH = ['#/src/getopt'])
     env.PrependUnique(LIBS = [getopt])
 
-main_obj = env.StaticObject('main.cpp')
-
-mesa_objs = env.StaticObject([
-    '#src/mesa/program/hash_table.c',
-    '#src/mesa/program/symbol_table.c',
-])
-
 if env['crosscompile'] and env['platform'] != 'embedded':
     Import('builtin_glsl_function')
 else:
+    main_obj = env.StaticObject('main.cpp')
+
+    mesa_objs = env.StaticObject([
+        '#src/mesa/program/hash_table.c',
+        '#src/mesa/program/symbol_table.c',
+    ])
+
     builtin_compiler = env.Program(
         target = 'builtin_compiler',
         source = main_obj + glsl_sources + ['builtin_stubs.cpp'] + mesa_objs,
@@ -149,6 +149,11 @@ env.Depends(glsl, glsl_parser)
 
 Export('glsl')
 
+# Skip building these programs as they will cause SCons error "Two environments
+# with different actions were specified for the same target"
+if env['crosscompile'] or env['platform'] == 'embedded':
+    Return()
+
 env = env.Clone()
 
 if env['platform'] == 'windows':
-- 
cgit v1.2.3