diff options
author | Jose Fonseca <[email protected]> | 2017-06-01 16:41:13 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2017-06-14 10:40:22 +0100 |
commit | c24bdf046e4608a1d372e27446d4a7e87b5458c3 (patch) | |
tree | c0ae1a20c18eb6f92f43b34b932dcdbef3f90cbb | |
parent | 15b5e5996ad1eaa88f9e684aeb7425235b7615fb (diff) |
automake: Link all libGL.so variants with -Bsymbolic.
We were linking src/glx with -Bsymbolic, but not the classic/gallium X11
libGL.so.
But it's always a good idea to build all libGL.so and all DRI drivers
with -Bsymbolic, otherwise they might resolve symbols from the 3rd party
application executable or shared libraries, which is _never_ what we
want.
In particular, this can happen when intercepting OpenGL calls with
apitrace, before
https://github.com/apitrace/apitrace/commit/63194b2573176ef34efce1a5c8b08e624b8dddf5
Cc: [email protected]
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
(cherry picked from commit ce5e83b8a0c757072075e781a090d35d9dc0e285)
-rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 1 | ||||
-rw-r--r-- | src/mesa/drivers/x11/Makefile.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index d2fd2ed7b68..7853422a50f 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -54,6 +54,7 @@ lib@GL_LIB@_la_SOURCES = xlib.c lib@GL_LIB@_la_LDFLAGS = \ -no-undefined \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \ + $(BSYMBOLIC) \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index ba79f6981b9..d5ca69d8281 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -76,6 +76,7 @@ lib@GL_LIB@_la_LIBADD = \ lib@GL_LIB@_la_LDFLAGS = \ -no-undefined \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ + $(BSYMBOLIC) \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) |