From 9a25c8af1b7fad0e7b3f3f3b4cbf6ae6e32e0e4d Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Mon, 18 Apr 2016 11:47:07 +0100 Subject: 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 Reviewed-by: Brian Paul --- src/gallium/drivers/svga/SConscript | 7 +++---- src/gallium/winsys/svga/drm/SConscript | 10 ++++------ src/mapi/glapi/SConscript | 3 +-- src/mesa/SConscript | 3 +-- 4 files changed, 9 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript index 0ee624616f9..aee337fa846 100644 --- 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 25850531d31..2cb11e610df 100644 --- 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 8ded46f32e0..994778a8fb9 100644 --- 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 5b80a216fef..71741010217 100644 --- 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', -- cgit v1.2.3