Mesa (master): scons: Disable build of assembly sources on Cygwin.

Vinson Lee vlee at kemper.freedesktop.org
Sat Sep 29 06:31:56 UTC 2012


Module: Mesa
Branch: master
Commit: 9549e55f1108540b513dfdb8277655a9f367c5f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9549e55f1108540b513dfdb8277655a9f367c5f8

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Sep 27 23:21:09 2012 -0700

scons: Disable build of assembly sources on Cygwin.

The assembly sources currently do not build on Cygwin.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mapi/glapi/SConscript |    2 +-
 src/mesa/SConscript       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index ad007a6..c336c25 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -48,7 +48,7 @@ for s in mapi_sources:
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
     GLAPI = '#src/mapi/glapi/'
 
     if env['machine'] == 'x86':
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index dba75a2..9819082 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -371,7 +371,7 @@ if env['gles']:
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',




More information about the mesa-commit mailing list