diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2021-05-15 14:25:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-15 14:25:37 +0200 |
| commit | 761ead497feff5fd259c9f6ca76d184bb8755373 (patch) | |
| tree | 52091b74397d9fb4e6fceb85154b26093f51e89a | |
| parent | 847fe7d750001a46a09b97ad57286612d0be8100 (diff) | |
patch 8.2.2852: configure can add --as-needed a second timev8.2.2852
Problem: Configure can add --as-needed a second time.
Solution: Only add --as-needed if not already there. (Natanael Copa,
closes #8189, closes #8181)
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.ac | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 934b34c24e..0b423a6577 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -14937,7 +14937,9 @@ $as_echo_n "checking linker --as-needed support... " >&6; } LINK_AS_NEEDED= # Check if linker supports --as-needed and --no-as-needed options if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then - LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'` + if ! echo "$LDFLAGS" | grep -q -- '-Wl,[^[:space:]]*--as-needed'; then + LDFLAGS="$LDFLAGS -Wl,--as-needed" + fi LINK_AS_NEEDED=yes fi if test "$LINK_AS_NEEDED" = yes; then diff --git a/src/configure.ac b/src/configure.ac index 657cc97f70..cc8d61f7f8 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4519,7 +4519,9 @@ AC_MSG_CHECKING(linker --as-needed support) LINK_AS_NEEDED= # Check if linker supports --as-needed and --no-as-needed options if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then - LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'` + if ! echo "$LDFLAGS" | grep -q -- '-Wl,[[^[:space:]]]*--as-needed'; then + LDFLAGS="$LDFLAGS -Wl,--as-needed" + fi LINK_AS_NEEDED=yes fi if test "$LINK_AS_NEEDED" = yes; then diff --git a/src/version.c b/src/version.c index 0d3c2ad52b..f7406eec77 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2852, +/**/ 2851, /**/ 2850, |