From f8aeb1c990b6e127497da1e46e0e4cdcb67ce9b3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Tue, 20 Sep 2011 20:40:05 +0100
Subject: [PATCH] scons: MacOSX build fixes.

---
 scons/custom.py        |  6 ++----
 src/SConscript         |  7 ++++---
 src/gallium/SConscript | 10 ++++++----
 src/glx/SConscript     |  3 ---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/scons/custom.py b/scons/custom.py
index b6d716cf437..08073162e74 100644
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -208,12 +208,10 @@ def pkg_use_modules(env, names):
         prefix = name + '_'
 
         if not 'HAVE_' + name in env:
-            print 'Attempt to use unknown module %s' % name
-            env.Exit(1)
+            raise Exception('Attempt to use unknown module %s' % name)
 
         if not env['HAVE_' + name]:
-            print 'Attempt to use unavailable module %s' % name
-            env.Exit(1)
+            raise Exception('Attempt to use unavailable module %s' % name)
 
         flags = {}
         for flag_name, flag_value in env.Dictionary().iteritems():
diff --git a/src/SConscript b/src/SConscript
index 1eee8761adb..91d1253adfd 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,9 +22,10 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:
-    SConscript('glx/SConscript')
-    SConscript('egl/main/SConscript')
-    SConscript('glu/sgi/SConscript')
+    if env['platform'] not in ['windows', 'darwin']:
+        SConscript('glx/SConscript')
+        SConscript('egl/main/SConscript')
+        SConscript('glu/sgi/SConscript')
 
     if env['gles']:
         SConscript('mapi/shared-glapi/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 3072ee936f2..3c063a2025c 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -55,7 +55,8 @@ SConscript('winsys/sw/null/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
-    SConscript('state_trackers/egl/SConscript')
+    if env['platform'] not in ['darwin']:
+        SConscript('state_trackers/egl/SConscript')
 
     if env['x11']:
         SConscript('state_trackers/glx/xlib/SConscript')
@@ -84,9 +85,10 @@ SConscript([
 ])
 
 if not env['embedded']:
-    SConscript([
-        'targets/egl-static/SConscript'
-    ])
+    if env['platform'] not in ['darwin']:
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])
 
     if env['x11']:
         SConscript([
diff --git a/src/glx/SConscript b/src/glx/SConscript
index afef33727df..fc8ad771b1c 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -1,8 +1,5 @@
 Import('*')
 
-if env['platform'] == 'windows':
-    Return()
-
 env = env.Clone()
 
 env.Prepend(CPPPATH = [
-- 
2.30.2