From ae760279f142244590c8aa76e3139529ca42952f Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 11 Feb 2011 16:44:13 +0000
Subject: scons: Try to support building 64bit binaries on 32bit windows.

---
 src/glsl/SConscript | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/glsl')

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f55d7de744f..ca17ddd6a2c 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -82,7 +82,7 @@ sources = [
 ] 
 
 
-if env['platform'] == common.host_platform:
+if not env['crosscompile'] or env['platform'] == 'embedded':
     if env['msvc']:
         env.Prepend(CPPPATH = ['#/src/getopt'])
         env.PrependUnique(LIBS = [getopt])
@@ -105,9 +105,6 @@ if env['platform'] == common.host_platform:
 
     Export('builtin_glsl_function')
 
-    if common.cross_compiling:
-        Return()
-
 sources += builtin_glsl_function
 
 glsl = env.ConvenienceLibrary(
-- 
cgit v1.2.3