summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/opencl
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-05-25 03:23:42 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-05-25 23:21:47 +0100
commit7a63bd960c33127dbce0e5802a7cda96dc011104 (patch)
tree6595890103cb4c7fc9e93bdbde9f665042511f65 /src/gallium/targets/opencl
parent239df5b654fcc52ba2e35370476cb03193dba04c (diff)
downloadexternal_mesa3d-7a63bd960c33127dbce0e5802a7cda96dc011104.zip
external_mesa3d-7a63bd960c33127dbce0e5802a7cda96dc011104.tar.gz
external_mesa3d-7a63bd960c33127dbce0e5802a7cda96dc011104.tar.bz2
automake: correctly append the version-script
Turns out that the AC conditional did not include the the version-scripts as expected. Rather it truncated the remaining linker flags. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'src/gallium/targets/opencl')
-rw-r--r--src/gallium/targets/opencl/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 55a73b4..7f2854d 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -6,12 +6,13 @@ lib@OPENCL_LIBNAME@_la_LDFLAGS = \
$(LLVM_LDFLAGS) \
-no-undefined \
-version-number 1:0 \
-if HAVE_LD_VERSION_SCRIPT
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym \
-endif
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
+if HAVE_LD_VERSION_SCRIPT
+lib@OPENCL_LIBNAME@_la_LDFLAGS += \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym
+endif
lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \