From 114f4b3d81eb5d39215544f0e90f304254cb476d Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Mon, 22 Oct 2018 12:56:34 +0200
Subject: build: Fix CLDFLAGS default

---
 configure    | 7 +++++--
 configure.ac | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 286733cf8..d8f73840a 100755
--- a/configure
+++ b/configure
@@ -3067,7 +3067,7 @@ if test -z "$CFLAGS"; then :
 fi
 case "$host_os" in
 	linux*)
-		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
 		# equivalent to -rdynamic
 		ELDFLAGS="-Wl,--export-dynamic"
 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -3087,7 +3087,7 @@ case "$host_os" in
 		;;
 	darwin*)
 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-		CLDFLAGS="$CLDFLAGS"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
 		ELDFLAGS=
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
@@ -3099,6 +3099,9 @@ case "$host_os" in
 		FSADM=no
 		BLKDEACTIVATE=no
 		;;
+	*)
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+		;;
 esac
 
 ################################################################################
diff --git a/configure.ac b/configure.ac
index c5d3207d9..70fd674b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([])
 AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
 case "$host_os" in
 	linux*)
-		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
 		# equivalent to -rdynamic
 		ELDFLAGS="-Wl,--export-dynamic"
 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -50,7 +50,7 @@ case "$host_os" in
 		;;
 	darwin*)
 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-		CLDFLAGS="$CLDFLAGS"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
 		ELDFLAGS=
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
@@ -62,6 +62,9 @@ case "$host_os" in
 		FSADM=no
 		BLKDEACTIVATE=no
 		;;
+	*)
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+		;;
 esac
 
 ################################################################################
-- 
cgit v1.2.1