diff options
Diffstat (limited to 'scons/gallium.py')
| -rw-r--r-- | scons/gallium.py | 25 |
1 files changed, 14 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 |