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>
This commit is contained in:
Jose Fonseca 2016-04-18 11:47:07 +01:00
parent c068610a7d
commit 9a25c8af1b
4 changed files with 9 additions and 14 deletions

View File

@ -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',

View File

@ -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',

View File

@ -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')

View File

@ -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',