From 1c757b34a7e8da49345bef2a66112f588752be13 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Wed, 17 Jan 2024 22:19:09 +0100
Subject: [PATCH] Fix build with extra libraries

Fixes: c829b4c7 ("Add LDFLAGS handling similar to CFLAGS")
---
 lib/Module.mk          | 2 +-
 lib/test/Module.mk     | 2 +-
 prog/dump/Module.mk    | 4 ++--
 prog/sensord/Module.mk | 2 +-
 prog/sensors/Module.mk | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Module.mk b/lib/Module.mk
index a1bb575d..282fa746 100644
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -69,7 +69,7 @@ LIBHEADERFILES := $(MODULE_DIR)/error.h $(MODULE_DIR)/sensors.h
 
 # How to create the shared library
 $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) $(LIB_DIR)/libsensors.map
-	$(CC) -shared $(ALL_LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) -lc -lm
+	$(CC) -shared -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) $(ALL_LDFLAGS) -lc -lm
 
 $(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME)
 	$(RM) $@
diff --git a/lib/test/Module.mk b/lib/test/Module.mk
index 6382431d..d30919d1 100644
--- a/lib/test/Module.mk
+++ b/lib/test/Module.mk
@@ -15,7 +15,7 @@ LIB_TEST_SCANNER_OBJS := \
 INCLUDEFILES += $(LIB_TEST_SOURCES:.c=.rd)
 
 $(LIB_TEST_DIR)/test-scanner: $(LIB_TEST_SCANNER_OBJS)
-	$(CC) $(EXLDFLAGS) -o $@ $(LIB_TEST_SCANNER_OBJS) -Llib
+	$(CC) -o $@ $(LIB_TEST_SCANNER_OBJS) -Llib $(EXLDFLAGS)
 
 all-lib-test: $(LIB_TEST_TARGETS)
 user :: all-lib-test
diff --git a/prog/dump/Module.mk b/prog/dump/Module.mk
index 5e522e3d..52d05332 100644
--- a/prog/dump/Module.mk
+++ b/prog/dump/Module.mk
@@ -43,10 +43,10 @@ all-prog-dump: $(PROGDUMPTARGETS)
 user :: all-prog-dump
 
 $(MODULE_DIR)/isadump: $(MODULE_DIR)/isadump.ro $(MODULE_DIR)/superio.ro $(MODULE_DIR)/util.ro
-	$(CC) $(EXLDFLAGS) -o $@ $^
+	$(CC) -o $@ $^ $(EXLDFLAGS)
 
 $(MODULE_DIR)/isaset: $(MODULE_DIR)/isaset.ro $(MODULE_DIR)/util.ro
-	$(CC) $(EXLDFLAGS) -o $@ $^
+	$(CC) -o $@ $^ $(EXLDFLAGS)
 
 install-prog-dump: all-prog-dump
 	$(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGDUMPMAN8DIR)
diff --git a/prog/sensord/Module.mk b/prog/sensord/Module.mk
index b8a8c956..692b8848 100644
--- a/prog/sensord/Module.mk
+++ b/prog/sensord/Module.mk
@@ -42,7 +42,7 @@ REMOVESENSORDBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGSENS
 REMOVESENSORDMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORDMAN8DIR)/%,$(PROGSENSORDMAN8FILES))
 
 $(PROGSENSORDTARGETS): $(PROGSENSORDSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS)
-	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORDSOURCES:.c=.ro) -Llib -lsensors -lrrd
+	$(CC) -o $@ $(PROGSENSORDSOURCES:.c=.ro) $(EXLDFLAGS) -Llib -lsensors -lrrd
 
 all-prog-sensord: $(PROGSENSORDTARGETS)
 user :: all-prog-sensord
diff --git a/prog/sensors/Module.mk b/prog/sensors/Module.mk
index ad9dd9db..18710f69 100644
--- a/prog/sensors/Module.mk
+++ b/prog/sensors/Module.mk
@@ -42,7 +42,7 @@ REMOVESENSORSZSH := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(ZSHCOMPDIR)/%,$(PROGS
 LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi)
 
 $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS)
-	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -lm
+	$(CC) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) $(EXLDFLAGS) -Llib -lsensors -lm
 
 all-prog-sensors: $(PROGSENSORSTARGETS)
 user :: all-prog-sensors