mesa: check for null shader->InfoLog before printing

[mesa.git] / common.py

diff --git a/common.py b/common.py
index e396ad949108c8a95eddb1c21fd4ae0b55258593..9141699ffec994e1f914103c0f1b504b4e9e9221 100644 (file)
--- a/common.py
+++ b/common.py
@@ -29,12 +29,17 @@ _machine_map = {
        'ppc' : 'ppc',
        'x86_64': 'x86_64',
 }
+
+
+# find default_machine value
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
        default_machine = os.environ['PROCESSOR_ARCHITECTURE']
 else:
        default_machine = _platform.machine()
 default_machine = _machine_map.get(default_machine, 'generic')
 
+
+# find default_llvm value
 if 'LLVM' in os.environ:
     default_llvm = 'yes'
 else:
@@ -54,6 +59,8 @@ else:
     except:
         pass
 
+
+# find default_dri value
 if default_platform in ('linux', 'freebsd'):
        default_dri = 'yes'
 elif default_platform in ('winddk', 'windows', 'wince', 'darwin'):
@@ -80,7 +87,7 @@ def AddOptions(opts):
        opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
                                                                                         allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
        opts.Add(EnumOption('platform', 'target platform', default_platform,
-                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded')))
+                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos5')))
        opts.Add('toolchain', 'compiler toolchain', 'default')
        opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
        opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))