From 6b55aacccbbc2c86f03eafab23d5d74bc165c9ed Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 23 Jan 2010 21:43:26 -0800 Subject: scons: Do not use ld options start-group and end-group on Darwin. Mac OS X ld does not support these options. --- scons/gallium.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index f4e82e8e0a..2d963a5f9e 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -476,7 +476,10 @@ def generate(env): '-Wl,-Bsymbolic', ] # Handle circular dependencies in the libraries - env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' + if env['platform'] in ('darwin'): + pass + else: + env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' if msvc: if not env['debug']: # enable Link-time Code Generation -- cgit v1.2.3 From 1019f0de1170f627e8e9ce7b449f7a76d89c6742 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Tue, 26 Jan 2010 19:13:27 +0000 Subject: only use -Werror flags with gcc 4.2.x and 4.3.x. could use a better test here though. --- scons/gallium.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 24f88e104b..1a095d8993 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -268,16 +268,22 @@ def generate(env): ccflags += [ '-Wall', '-Wmissing-field-initializers', - '-Werror=pointer-arith', '-Wno-long-long', '-ffast-math', '-fmessage-length=0', # be nice to Eclipse ] cflags += [ - '-Werror=declaration-after-statement', '-Wmissing-prototypes', '-std=gnu99', ] + if env['CCVERSION'].startswith('4.2.') or + env['CCVERSION'].startswith('4.3.'): + ccflags += [ + '-Werror=pointer-arith', + ] + cflags += [ + '-Werror=declaration-after-statement', + ] if msvc: # See also: # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx -- cgit v1.2.3 From 18bb614acf3b9bbfd8c81253a6fd2fb24800dd70 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Tue, 26 Jan 2010 19:18:32 +0000 Subject: fix typo --- scons/gallium.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 1a095d8993..5aa0b7bddd 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -276,8 +276,7 @@ def generate(env): '-Wmissing-prototypes', '-std=gnu99', ] - if env['CCVERSION'].startswith('4.2.') or - env['CCVERSION'].startswith('4.3.'): + if env['CCVERSION'].startswith('4.2.') or env['CCVERSION'].startswith('4.3.'): ccflags += [ '-Werror=pointer-arith', ] -- cgit v1.2.3 From 7d29afb3a29642e6e13fb30948f7c87434057102 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 26 Jan 2010 22:56:58 -0800 Subject: scons: Use '-Werror=' option on GCC 4.2.x and greater. The existing code only checked for GCC 4.2.x and 4.3.x. --- scons/gallium.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 5aa0b7bddd..c88af96898 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -30,6 +30,7 @@ Frontend-tool for Gallium3D architecture. # +import distutils.version import os import os.path import re @@ -276,7 +277,7 @@ def generate(env): '-Wmissing-prototypes', '-std=gnu99', ] - if env['CCVERSION'].startswith('4.2.') or env['CCVERSION'].startswith('4.3.'): + if distutils.version.LooseVersion(env['CCVERSION']) >= distutils.version.LooseVersion('4.2'): ccflags += [ '-Werror=pointer-arith', ] -- cgit v1.2.3 From 1ecf505087136c1120f440c265c57418b14d0442 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 27 Jan 2010 12:46:46 +0000 Subject: Duplicate CCVERSION check code to compensate for different env CC. --- scons/gallium.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index c88af96898..91a2fbbca6 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -34,6 +34,7 @@ import distutils.version import os import os.path import re +import subprocess import SCons.Action import SCons.Builder @@ -109,6 +110,9 @@ def generate(env): env['toolchain'] = 'wcesdk' env.Tool(env['toolchain']) + if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] + env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-') env['msvc'] = env['CC'] == 'cl' @@ -232,9 +236,19 @@ def generate(env): cxxflags = [] # C++ ccflags = [] # C & C++ if gcc: + ccversion = '' + pipe = SCons.Action._subproc(env, [env['CC'], '--version'], + stdin = 'devnull', + stderr = 'devnull', + stdout = subprocess.PIPE) + if pipe.wait() == 0: + line = pipe.stdout.readline() + match = re.search(r'[0-9]+(\.[0-9]+)+', line) + if match: + ccversion = match.group(0) if debug: ccflags += ['-O0', '-g3'] - elif env['CCVERSION'].startswith('4.2.'): + elif ccversion.startswith('4.2.'): # gcc 4.2.x optimizer is broken print "warning: gcc 4.2.x optimizer is broken -- disabling optimizations" ccflags += ['-O0', '-g3'] @@ -277,7 +291,7 @@ def generate(env): '-Wmissing-prototypes', '-std=gnu99', ] - if distutils.version.LooseVersion(env['CCVERSION']) >= distutils.version.LooseVersion('4.2'): + if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'): ccflags += [ '-Werror=pointer-arith', ] -- cgit v1.2.3 From 51ab599ddb213d6b846f333bbf03d5f6dde4831f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 28 Jan 2010 01:32:15 -0800 Subject: scons: Do not use linker option '-Bsymbolic' on Mac OS X. ld on Mac OS X does not recognize the option '-Bsymbolic'. --- scons/gallium.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 91a2fbbca6..467b67fad7 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -393,9 +393,10 @@ def generate(env): linkflags += ['-m32'] if env['machine'] == 'x86_64': linkflags += ['-m64'] - shlinkflags += [ - '-Wl,-Bsymbolic', - ] + if env['platform'] not in ('darwin'): + shlinkflags += [ + '-Wl,-Bsymbolic', + ] # Handle circular dependencies in the libraries if env['platform'] in ('darwin'): pass -- cgit v1.2.3 From bd60e6cd5ce7c19e52338f12f73dfa1b622391d5 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Thu, 28 Jan 2010 15:34:10 +0000 Subject: add PIPE_SUBSYSTEM_EMBEDDED when embedded platform used --- scons/gallium.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 467b67fad7..03856207ed 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -229,6 +229,8 @@ def generate(env): if platform == 'wince': cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE'] cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE_OGL'] + if platform == 'embedded': + cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED'] env.Append(CPPDEFINES = cppdefines) # C compiler options -- cgit v1.2.3 From 7683271e63e4527fc72f309472181c743922e7e9 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Fri, 29 Jan 2010 10:22:22 +0000 Subject: another gcc 4.2.x check for mstackrealign --- scons/gallium.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scons/gallium.py') diff --git a/scons/gallium.py b/scons/gallium.py index 03856207ed..ac68bd604c 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -276,8 +276,11 @@ def generate(env): # instead. ccflags += [ '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics - '-mstackrealign', # ensure stack is aligned ] + if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'): + ccflags += [ + '-mstackrealign', # ensure stack is aligned + ] if env['machine'] == 'x86_64': ccflags += ['-m64'] # See also: -- cgit v1.2.3