summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2015-11-23 14:22:24 +1100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-12-04 16:36:44 +0000
commit15344c978bccec869ca66c24e0406a75f93d87c8 (patch)
treeb9ec645d7a6d3aa16217a32eb4bdffc38dcc1171
parentf1bb27acc545cfdaec442f4434d7351d506cd375 (diff)
automake: fix some occurrences of hardcoded -ldl and -lpthread
Correct some occurrences of -ldl and -lpthread to use $(DLOPEN_LIBS) and $(PTHREAD_LIBS) respectively. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 99cd60083518ad4465e3e29996168e8fa8a89fbb)
-rw-r--r--src/gallium/targets/opencl/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 3cb29766724..08f95e8074c 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -20,7 +20,7 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
$(ELF_LIB) \
- -ldl \
+ $(DLOPEN_LIBS) \
-lclangCodeGen \
-lclangFrontendTool \
-lclangFrontend \
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 9d003e48bd8..ad687bf59a4 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -51,7 +51,8 @@ libi965_compiler_la_SOURCES = $(i965_compiler_FILES)
TEST_LIBS = \
libi965_compiler.la \
../../../libmesa.la \
- -lpthread -ldl \
+ $(PTHREAD_LIBS) \
+ $(DLOPEN_LIBS) \
../common/libdri_test_stubs.la
TESTS = \