From f022da9e5ff807a8ea538cbdb01faf27421731ff Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 23 Apr 2024 23:09:48 +0200
Subject: [PATCH] configure.ac: leave LDFLAGS resolving on make time

Use LDFLAGS separately with every use of CLDFLAGS and leave
this flag only for handling versioning.

This will reflect any LDFLAGS setting use during make.
---
 configure.ac       | 4 ++--
 libdm/make.tmpl.in | 6 +++---
 make.tmpl.in       | 6 +++---
 tools/Makefile.in  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index c09adad60..b8bcfbb60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AS_CASE(["$host_os"],
 		FSADM="no"
 		LVMIMPORTVDO="no"
 		BLKDEACTIVATE="no"],
-	[CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"])
+	[])
 
 ################################################################################
 dnl -- Checks for programs.
@@ -836,7 +836,7 @@ AS_IF([test "$GCC" = "yes" && test "$symvers" = "gnu"], [
 		  [Define to use GNU versioning in the shared library.])
 	AS_CASE(["$host_os"],
 		[linux*], [
-			CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
+			CLDFLAGS="-Wl,--version-script,.export.sym"
 			LDDEPS="$LDDEPS .export.sym"])
 ])
 
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index d40bf1179..5c6b2160f 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -434,7 +434,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 
 %.so: %.o
 	$(SHOW) "    [CC] $(<F)"
-	$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
+	$(Q) $(CC) -c $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
 
 ifneq (,$(LIB_SHARED))
 
@@ -443,11 +443,11 @@ $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
 	$(SHOW) "    [CC] $@"
 ifeq ("@LIB_SUFFIX@","so")
 	$(Q) $(CC) -shared -Wl,-soname,$(notdir $@) \
-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 ifeq ("@LIB_SUFFIX@","dylib")
 	$(Q) $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
diff --git a/make.tmpl.in b/make.tmpl.in
index e0cb70709..238f690b9 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -508,7 +508,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 
 %.so: %.o
 	$(SHOW) "    [CC] $(<F)"
-	$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
+	$(Q) $(CC) -c $(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
 
 ifneq (,$(LIB_SHARED))
 
@@ -517,11 +517,11 @@ $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
 	$(SHOW) "    [CC] $@"
 ifeq ("@LIB_SUFFIX@","so")
 	$(Q) $(CC) -shared -Wl,-soname,$(notdir $@) \
-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 ifeq ("@LIB_SUFFIX@","dylib")
 	$(Q) $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 06cbb7ea3..f2d7e0de0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -155,7 +155,7 @@ liblvm2cmd-static.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
 	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
-		$(CFLAGS) $(CLDFLAGS) -o $@ \
+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) -o $@ \
 		@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ \
 		$(INTERNAL_LIBS) $(LVMLIBS)