diff options
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/gallium.py | 25 | ||||
| -rw-r--r-- | scons/udis86.py | 42 |
2 files changed, 56 insertions, 11 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 8082aba6f2..bf6172b4d7 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -44,17 +44,18 @@ import fixes def quietCommandLines(env): # Quiet command lines # See also http://www.scons.org/wiki/HidingCommandLinesInOutput - env['ASCOMSTR'] = "Assembling $SOURCE ..." - env['CCCOMSTR'] = "Compiling $SOURCE ..." - env['SHCCCOMSTR'] = "Compiling $SOURCE ..." - env['CXXCOMSTR'] = "Compiling $SOURCE ..." - env['SHCXXCOMSTR'] = "Compiling $SOURCE ..." - env['ARCOMSTR'] = "Archiving $TARGET ..." - env['RANLIBCOMSTR'] = "Indexing $TARGET ..." - env['LINKCOMSTR'] = "Linking $TARGET ..." - env['SHLINKCOMSTR'] = "Linking $TARGET ..." - env['LDMODULECOMSTR'] = "Linking $TARGET ..." - env['SWIGCOMSTR'] = "Generating $TARGET ..." + env['ASCOMSTR'] = " Assembling $SOURCE ..." + env['ASPPCOMSTR'] = " Assembling $SOURCE ..." + env['CCCOMSTR'] = " Compiling $SOURCE ..." + env['SHCCCOMSTR'] = " Compiling $SOURCE ..." + env['CXXCOMSTR'] = " Compiling $SOURCE ..." + env['SHCXXCOMSTR'] = " Compiling $SOURCE ..." + env['ARCOMSTR'] = " Archiving $TARGET ..." + env['RANLIBCOMSTR'] = " Indexing $TARGET ..." + env['LINKCOMSTR'] = " Linking $TARGET ..." + env['SHLINKCOMSTR'] = " Linking $TARGET ..." + env['LDMODULECOMSTR'] = " Linking $TARGET ..." + env['SWIGCOMSTR'] = " Generating $TARGET ..." def createConvenienceLibBuilder(env): @@ -461,6 +462,8 @@ def generate(env): shlinkflags += [ '-Wl,-Bsymbolic', ] + # Handle circular dependencies in the libraries + env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' if platform == 'windows' and msvc: # See also: # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx diff --git a/scons/udis86.py b/scons/udis86.py new file mode 100644 index 0000000000..ba71d4eb0b --- /dev/null +++ b/scons/udis86.py @@ -0,0 +1,42 @@ +"""udis86 + +Tool-specific initialization for udis86 + +""" + +# +# Copyright (c) 2009 VMware, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +def generate(env): + conf = env.Configure() + + if conf.CheckHeader('udis86.h'): # and conf.CheckLib('udis86'): + env.Append(CPPDEFINES = [('HAVE_UDIS86', '1')]) + env.Prepend(LIBS = ['udis86']) + + conf.Finish() + +def exists(env): + return True + +# vim:set ts=4 sw=4 et: |