build: Fix CLDFLAGS default

diff --git a/configure b/configure
index 286733cf8839f253eeb03dfaf6ce06891e81b6aa..d8f73840a8865ddd28ad4c276e4f24651f1cee5f 100755 (executable)
--- 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 c5d3207d9244669e4c41212eeea33c4f1a4987b9..70fd674b5f932a84360071c0e17d06ee6d1a22b9 100644 (file)
--- 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
 
 ################################################################################