xbps-src: only process broken_as_needed in one place.

2011-07-04 10:56:35 +02:00
parent e9faa54033
commit 141c0ab3ba
3 changed files with 5 additions and 11 deletions
--- a/xbps-src/shutils/tmpl_funcs.sh.in
+++ b/xbps-src/shutils/tmpl_funcs.sh.in
@@ -298,6 +298,11 @@ set_tmpl_common_vars()
 	export CPPFLAGS="$XBPS_CPPFLAGS $CPPFLAGS"
 	export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS"

+	if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then
+		export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")"
+		export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS"
+	fi
+
 	if [ -z "$in_chroot" ]; then
 		export CPPFLAGS="-I$XBPS_MASTERDIR/usr/include"
 		if [ -d /usr/lib/libfakeroot ]; then