diff options
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/crossmingw.py | 42 | ||||
| -rw-r--r-- | mesalib/scons/gallium.py | 25 |
2 files changed, 13 insertions, 54 deletions
diff --git a/mesalib/scons/crossmingw.py b/mesalib/scons/crossmingw.py index 23c56c0a2..1287e0ec8 100644 --- a/mesalib/scons/crossmingw.py +++ b/mesalib/scons/crossmingw.py @@ -130,40 +130,6 @@ SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan) -def compile_without_gstabs(env, sources, c_file): - '''This is a hack used to compile some source files without the - -gstabs option. - - It seems that some versions of mingw32's gcc (4.4.2 at least) die - when compiling large files with the -gstabs option. -gstabs is - related to debug symbols and can be omitted from the effected - files. - - This function compiles the given c_file without -gstabs, removes - the c_file from the sources list, then appends the new .o file to - sources. Then return the new sources list. - ''' - - # Modify CCFLAGS to not have -gstabs option: - env2 = env.Clone() - flags = str(env2['CCFLAGS']) - flags = flags.replace("-gstabs", "") - env2['CCFLAGS'] = SCons.Util.CLVar(flags) - - # Build the special-case files: - obj_file = env2.SharedObject(c_file) - - # Replace ".cpp" or ".c" with ".o" - o_file = c_file.replace(".cpp", ".o") - o_file = o_file.replace(".c", ".o") - - # Replace the .c files with the specially-compiled .o file - sources.remove(c_file) - sources.append(o_file) - - return sources - - def generate(env): mingw_prefix = find(env) @@ -221,13 +187,5 @@ def generate(env): env['LIBPREFIXES'] = [ 'lib', '' ] env['LIBSUFFIXES'] = [ '.a', '.lib' ] - # MinGW x86 port of gdb does not handle well dwarf debug info which is the - # default in recent gcc versions. The x64 port gdb from mingw-w64 seems to - # handle it fine though, so stick with the default there. - if env['machine'] != 'x86_64': - env.AppendUnique(CCFLAGS = ['-gstabs']) - - env.AddMethod(compile_without_gstabs, 'compile_without_gstabs') - def exists(env): return find(env) diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 57b5b418f..2e341e99f 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -152,7 +152,7 @@ def generate(env): platform = env['platform'] x86 = env['machine'] == 'x86' ppc = env['machine'] == 'ppc' - gcc = env['gcc'] + gcc_compat = env['gcc'] or env['clang'] msvc = env['msvc'] suncc = env['suncc'] icc = env['icc'] @@ -279,7 +279,7 @@ def generate(env): ('_WIN32_WINNT', '0x0601'), ('WINVER', '0x0601'), ] - if gcc: + if gcc_compat: cppdefines += [('__MSVCRT_VERSION__', '0x0700')] if msvc: cppdefines += [ @@ -309,19 +309,20 @@ def generate(env): cflags = [] # C cxxflags = [] # C++ ccflags = [] # C & C++ - if gcc: + if gcc_compat: ccversion = env['CCVERSION'] if env['build'] == 'debug': ccflags += ['-O0'] - elif ccversion.startswith('4.2.'): + elif env['gcc'] and ccversion.startswith('4.2.'): # gcc 4.2.x optimizer is broken print "warning: gcc 4.2.x optimizer is broken -- disabling optimizations" ccflags += ['-O0'] else: ccflags += ['-O3'] - # gcc's builtin memcmp is slower than glibc's - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 - ccflags += ['-fno-builtin-memcmp'] + if env['gcc']: + # gcc's builtin memcmp is slower than glibc's + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 + ccflags += ['-fno-builtin-memcmp'] # Work around aliasing bugs - developers should comment this out ccflags += ['-fno-strict-aliasing'] ccflags += ['-g'] @@ -329,8 +330,9 @@ def generate(env): # See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling? ccflags += [ '-fno-omit-frame-pointer', - '-fno-optimize-sibling-calls', ] + if env['gcc']: + ccflags += ['-fno-optimize-sibling-calls'] if env['machine'] == 'x86': ccflags += [ '-m32', @@ -448,7 +450,7 @@ def generate(env): env.Append(SHCCFLAGS = ['/LD']) # Assembler options - if gcc: + if gcc_compat: if env['machine'] == 'x86': env.Append(ASFLAGS = ['-m32']) if env['machine'] == 'x86_64': @@ -457,7 +459,7 @@ def generate(env): # Linker options linkflags = [] shlinkflags = [] - if gcc: + if gcc_compat: if env['machine'] == 'x86': linkflags += ['-m32'] if env['machine'] == 'x86_64': @@ -495,7 +497,7 @@ def generate(env): env.Append(SHLINKFLAGS = shlinkflags) # We have C++ in several libraries, so always link with the C++ compiler - if env['gcc'] or env['clang']: + if gcc_compat: env['LINK'] = env['CXX'] # Default libs @@ -533,7 +535,6 @@ def generate(env): env.PkgCheckModules('XF86VIDMODE', ['xxf86vm']) env.PkgCheckModules('DRM', ['libdrm >= 2.4.24']) env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30']) - env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.42']) env.PkgCheckModules('XORG', ['xorg-server >= 1.6.0']) env.PkgCheckModules('KMS', ['libkms >= 2.4.24']) env.PkgCheckModules('UDEV', ['libudev > 150']) |