summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-03-13 05:44:33 +0000
committerEmil Velikov <[email protected]>2014-03-31 13:09:23 +0100
commitd187a150d45cbf5bd3476eab49be5057382c2c86 (patch)
tree21d55b22990122812b5875f31cc1d09966fedc39 /src/gallium
parent902dc61f886c0d719ce25894bbc8032ede0f409b (diff)
automake: add -Wl,--no-undefined to all libraries
... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/Automake.inc9
-rw-r--r--src/gallium/targets/gbm/Makefile.am6
-rw-r--r--src/gallium/targets/libgl-xlib/Makefile.am5
-rw-r--r--src/gallium/targets/opencl/Makefile.am4
-rw-r--r--src/gallium/targets/osmesa/Makefile.am7
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am1
-rw-r--r--src/gallium/targets/xa/Makefile.am3
7 files changed, 27 insertions, 8 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f36d93da403..1151f916bef 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -64,20 +64,23 @@ GALLIUM_VDPAU_LINKER_FLAGS = \
-module \
-no-undefined \
-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
- -export-symbols-regex $(VDPAU_EXPORTS)
+ -export-symbols-regex $(VDPAU_EXPORTS) \
+ -Wl,--no-undefined
GALLIUM_XVMC_LINKER_FLAGS = \
-shared \
-module \
-no-undefined \
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- -export-symbols-regex '^XvMC'
+ -export-symbols-regex '^XvMC' \
+ -Wl,--no-undefined
GALLIUM_OMX_LINKER_FLAGS = \
-shared \
-module \
-no-undefined \
- -export-symbols-regex $(EXPORTS)
+ -export-symbols-regex $(EXPORTS) \
+ -Wl,--no-undefined
GALLIUM_VDPAU_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index bad581d7383..c109ddbb463 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -66,7 +66,11 @@ gbm_gallium_drm_la_LIBADD += \
$(LIBDRM_LIBS)
endif
-gbm_gallium_drm_la_LDFLAGS = -no-undefined -avoid-version -module
+gbm_gallium_drm_la_LDFLAGS = \
+ -module \
+ -no-undefined \
+ -avoid-version \
+ -Wl,--no-undefined
if HAVE_MESA_LLVM
gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS)
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index cc382db08b2..d7aec7b5b50 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -44,7 +44,10 @@ lib_LTLIBRARIES = libGL.la
nodist_EXTRA_libGL_la_SOURCES = dummy.cpp
libGL_la_SOURCES = xlib.c
-libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefined
+libGL_la_LDFLAGS = \
+ -no-undefined \
+ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
+ -Wl,--no-undefined
libGL_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index eb25a5e47aa..b401d10d7a7 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -5,7 +5,9 @@ lib_LTLIBRARIES = lib@[email protected]
lib@OPENCL_LIBNAME@_la_LDFLAGS = \
$(LLVM_LDFLAGS) \
-no-undefined \
- -version-number 1:0
+ -version-number 1:0 \
+ -Wl,--no-undefined
+
lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index 2b133c44cb9..651fc5d2b45 100644
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -39,7 +39,12 @@ lib_LTLIBRARIES = lib@[email protected]
nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
lib@OSMESA_LIB@_la_SOURCES = target.c
-lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined
+lib@OSMESA_LIB@_la_LDFLAGS = \
+ -module \
+ -no-undefined \
+ -version-number @OSMESA_VERSION@ \
+ -Wl,--no-undefined
+
if HAVE_SHARED_GLAPI
SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 6e78a75b6d2..00823fe5bdd 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -49,6 +49,7 @@ AM_LDFLAGS = \
-module \
-no-undefined \
-avoid-version \
+ -Wl,--no-undefined \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
index ed87b9f59dc..214c51df883 100644
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -66,7 +66,8 @@ endif
libxatracker_la_LDFLAGS = \
-no-undefined \
- -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY)
+ -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \
+ -Wl,--no-undefined
if HAVE_MESA_LLVM
libxatracker_la_LIBADD += $(LLVM_LIBS)