Module: Mesa
Branch: master
Commit: 4380a2098b61cfa0dd3855bd63d3c8b70ce25dd5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4380a2098b61cfa0dd3855bd63d3c8b70ce25dd5
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Thu Dec 8 17:58:21 2016 +0000
gallium: correctly manage libsensors link flags
We should be using LIBS rather than the LDFLAGS variable. Furthermore
try to keep the linking to the final stage, rather than intermetent
static library.
Cc: Steven Toth <st...@kernellabs.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
configure.ac | 6 +++---
src/gallium/Automake.inc | 1 +
src/gallium/auxiliary/Makefile.am | 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index b68b51e..450fca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1127,11 +1127,11 @@ AC_ARG_ENABLE([lmsensors],
AM_CONDITIONAL(HAVE_LIBSENSORS, test "x$enable_lmsensors" = xyes)
if test "x$enable_lmsensors" = xyes ; then
DEFINES="${DEFINES} -DHAVE_LIBSENSORS=1"
- LIBSENSORS_LDFLAGS="-lsensors"
+ LIBSENSORS_LIBS="-lsensors"
else
- LIBSENSORS_LDFLAGS=""
+ LIBSENSORS_LIBS=""
fi
-AC_SUBST(LIBSENSORS_LDFLAGS)
+AC_SUBST(LIBSENSORS_LIBS)
case "$host_os" in
linux*)
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 6aadcb9..a01fa54 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -46,6 +46,7 @@ GALLIUM_TARGET_CFLAGS = \
GALLIUM_COMMON_LIB_DEPS = \
-lm \
+ $(LIBSENSORS_LIBS) \
$(CLOCK_LIB) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS)
diff --git a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index 1154c79..def0098 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -44,8 +44,6 @@ libgallium_la_SOURCES += \
endif
-libgallium_la_LDFLAGS = $(LIBSENSORS_LDFLAGS)
-
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
