projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 241f15a)
automake: fix some occurrences of hardcoded -ldl and -lpthread
authorJonathan Gray <jsg@jsg.id.au>
Mon, 23 Nov 2015 03:22:24 +0000 (14:22 +1100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Tue, 1 Dec 2015 16:53:40 +0000 (16:53 +0000)
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>
src/gallium/targets/opencl/Makefile.am patch | blob | history
src/mesa/drivers/dri/i965/Makefile.am patch | blob | history

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 3cb29766724b8314141c15c73dd8dbd4a6927e51..08f95e8074c471e2ec953eab10b68310de270639 100644 (file)
--- 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 9d003e48bd80d362622aaae2e2f01ac5e148d43b..ad687bf59a478a4cd8843935b412abd0ce57bb97 100644 (file)
--- 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 = \