1 files changed, 2 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index e9e799dc78d..bf6172b4d77 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