emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix bug where we linked again -lm even though it is not needed.

Browse Source 
For BBOX_LIB_LIST="crypt m" trylink ... with just applet true, we pulled in
  libm because in this case we tried to use invalid flags (plain "-l" without
  a lib) which of course failed, thus the script thought that -lm was needed.

  The fix is not to pass "-l" without a lib if we are about to check if any
  or the last remaining lib is really needed.
This commit is contained in:
Bernhard Reutner-Fischer 2007-09-02 14:51:54 +00:00
parent 7bc5360bba
commit 8d91c13df5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/trylink
View File

@ -39,8 +39,17 @@ while test "$BBOX_LIB_LIST"; do
for one in $BBOX_LIB_LIST; do for one in $BBOX_LIB_LIST; do
without_one=`echo " $BBOX_LIB_LIST " | sed "s/ $one / /g" | xargs` without_one=`echo " $BBOX_LIB_LIST " | sed "s/ $one / /g" | xargs`
l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/'` l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/'`
$debug && echo "Trying -l options: $l_list" # If l_list is just "-l" without a lib, then make sure to test the
if try "-Wl,--start-group $l_list -Wl,--end-group" "$@"; then # correct thing to fail: just using -l will fail, so the last lib
# (usually m in my case) will incorrectly be added as needed.
if test "x$without_one" != "x"; then
l_list="-Wl,--start-group $l_list -Wl,--end-group"
else
# without_one is empty, so l_list has to be empty too
l_list=""
fi
$debug && echo "Trying -l options: '$l_list'"
if try "$l_list" "$@"; then
echo "Library $one is not needed" echo "Library $one is not needed"
BBOX_LIB_LIST="$without_one" BBOX_LIB_LIST="$without_one"
all_needed=false all_needed=false