diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2018-10-22 12:56:34 +0200 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2018-10-30 10:15:44 +0100 |
| commit | 1e40e734e6da2ee4b20286a132eafe679d5695d1 (patch) | |
| tree | 32ee84f2914591d70625535637a65b453bcfb4f0 | |
| parent | aecf542126640faa17c240afbb1ea61f11355c39 (diff) | |
| download | lvm2-1e40e734e6da2ee4b20286a132eafe679d5695d1.tar.gz | |
build: Fix CLDFLAGS default
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -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 ################################################################################ |