From 571f2f78141a5c13aaf90cfbfe99c04af8158e4e Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sat, 22 Oct 2011 18:29:05 +1000
Subject: Fix libtool detection of --as-needed flag

The fix for -Wl,--as-needed in commit b0f9477f assumes that
--as-needed/--no-as-needed is the only option given in a -Wl line.
However, it is perfectly valid to specify multiple flags comma
separated after a single -Wl (e.g. the default LDFLAGS in Arch
Linux makepkg.conf).

Adjust the fix so it detect --as-needed in a more general context

> readelf -d lib/libalpm/.libs/libalpm.so.?.?.? | grep NEEDED | wc -l
Before: 13
After: 5

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 ltmain.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ltmain.sh b/ltmain.sh
index fafd01b2..5f505e27 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -5800,9 +5800,12 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
-      -Wl,--as-needed|-Wl,--no-as-needed)
-	deplibs="$deplibs $arg"
-	continue
+      -Wl,*--as-needed*)
+	deplibs="$deplibs $wl--as-needed"
+	;;
+
+      -Wl,*--no-as-needed*)
+	deplibs="$deplibs $wl--no-as-needed"
 	;;
 
       -Wl,*)
-- 
cgit v1.2.3-70-g09d2