diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
| commit | a512985fd81c1ed4ccc5e69aaa05015cf7ff844d (patch) | |
| tree | 69e6e898deaeaed2b4dfb5851707c68261c464de /scons/gallium.py | |
| parent | 0b5af41c6fae2809f4567a7cecbd207e5e4f3ab5 (diff) | |
| parent | c80bc3abcd3939e5e2d45aea4b01ff22bfec244b (diff) | |
Merge branch 'master' into asm-shader-rework-1
Conflicts:
src/mesa/shader/arbprogparse.c
Diffstat (limited to 'scons/gallium.py')
| -rw-r--r-- | scons/gallium.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index e9e799dc78..bf6172b4d7 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -462,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 |