scons: Whenever possible decide what to do based on platform and not compiler.

Because compilers like GCC and Clang are effectively available everywhere
so their presence/absence is seldom conclusive.

Furthermore, all compilers we use now have stdint.h.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
index 0ee624616f974e05268ad1f7daac0cec2c0c036d..aee337fa8462f8abf51384a9fe30d510a992dc61 100644 (file)
--- a/src/gallium/drivers/svga/SConscript
+++ b/src/gallium/drivers/svga/SConscript
@@ -8,10 +8,9 @@ if env['suncc']:
        print 'warning: not building svga'
        Return()
 
-if env['gcc'] or env['clang']:
-       env.Append(CPPDEFINES = [
-               'HAVE_STDINT_H', 
-       ])
+env.Append(CPPDEFINES = [
+       'HAVE_STDINT_H',
+])
        
 env.Prepend(CPPPATH = [
        'include',

diff --git a/src/gallium/winsys/svga/drm/SConscript b/src/gallium/winsys/svga/drm/SConscript
index 25850531d316c63dbc5e26bf5a5d5357dfbf87c0..2cb11e610df2f867a952e26aa8ff31e097fda015 100644 (file)
--- a/src/gallium/winsys/svga/drm/SConscript
+++ b/src/gallium/winsys/svga/drm/SConscript
@@ -4,12 +4,10 @@ env = env.Clone()
 
 env.PkgUseModules('DRM')
 
-if env['gcc'] or env['clang'] or env['icc']:
-    env.Append(CCFLAGS = ['-fvisibility=hidden'])
-    env.Append(CPPDEFINES = [
-        'HAVE_STDINT_H', 
-        '-D_FILE_OFFSET_BITS=64',
-    ])
+env.Append(CPPDEFINES = [
+    'HAVE_STDINT_H',
+    '-D_FILE_OFFSET_BITS=64',
+])
 
 env.Prepend(CPPPATH = [
     '#/src/gallium/drivers/svga',

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 8ded46f32e039600bba7ef0eabd0e3c3798e9a51..994778a8fb95dee246c36437bb27bae8810b4ccf 100644 (file)
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -52,8 +52,7 @@ for s in mapi_sources:
 #
 # Assembly sources
 #
-if (env['gcc'] or env['clang']) and \
-   env['platform'] not in ('cygwin', 'darwin', 'windows'):
+if env['platform'] not in ('cygwin', 'darwin', 'windows'):
     GLAPI = '#src/mapi/glapi/'
     sources = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
 

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 5b80a216feffd226047d32880d90082075a6198b..717410102170cd1553112a77a9191c32fc470b2f 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -82,8 +82,7 @@ format_unpack = env.CodeGenerate(
 #
 # Assembly sources
 #
-if (env['gcc'] or env['clang']) and \
-   env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
+if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',