mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-29 12:20:10 +01:00
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 <stoth@kernellabs.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
parent
cb5e799448
commit
4380a2098b
3 changed files with 4 additions and 5 deletions
|
|
@ -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*)
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ GALLIUM_TARGET_CFLAGS = \
|
|||
|
||||
GALLIUM_COMMON_LIB_DEPS = \
|
||||
-lm \
|
||||
$(LIBSENSORS_LIBS) \
|
||||
$(CLOCK_LIB) \
|
||||
$(PTHREAD_LIBS) \
|
||||
$(DLOPEN_LIBS)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue