From 99cd60083518ad4465e3e29996168e8fa8a89fbb Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 23 Nov 2015 14:22:24 +1100 Subject: [PATCH] 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 Cc: "11.0 11.1" Reviewed-by: Emil Velikov --- src/gallium/targets/opencl/Makefile.am | 2 +- src/mesa/drivers/dri/i965/Makefile.am | 3 ++- 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 = \ -- 2.30.2