From: José Fonseca <jfonseca@vmware.com>
Date: Sun, 28 Jun 2009 09:54:23 +0000 (+0100)
Subject: scons: Use -Bsymbolic linker option.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72ad039d19e033baff774b184ece9ffbfef4a2ff;p=mesa.git

scons: Use -Bsymbolic linker option.

This prevents the error

  relocation R_X86_64_PC32 against symbol `_gl_DispatchTSD' can not be used when making a shared object; recompile with -fPIC

when building on x86_64 architecture.
---

diff --git a/scons/gallium.py b/scons/gallium.py
index ee45af50c29..b69f2f2a75a 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -448,11 +448,15 @@ def generate(env):
 
     # Linker options
     linkflags = []
+    shlinkflags = []
     if gcc:
         if env['machine'] == 'x86':
             linkflags += ['-m32']
         if env['machine'] == 'x86_64':
             linkflags += ['-m64']
+        shlinkflags += [
+            '-Wl,-Bsymbolic',
+        ]
     if platform == 'windows' and msvc:
         # See also:
         # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
@@ -500,6 +504,7 @@ def generate(env):
             '/entry:_DllMainCRTStartup',
         ]
     env.Append(LINKFLAGS = linkflags)
+    env.Append(SHLINKFLAGS = shlinkflags)
 
     # Default libs
     env.Append(LIBS = [])