Revision a36abbbb

b/configure
1394 1394
  CLOCKLIBS="-lrt"
1395 1395
fi
1396 1396

  
1397
# Determine what linker flags to use to force archive inclusion
1398
check_linker_flags()
1399
{
1400
    w2=
1401
    if test "$2" ; then
1402
	w2=-Wl,$2
1403
    fi
1404
    $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null 2>/dev/null
1405
}
1406

  
1407
cat > $TMPC << EOF
1408
int main(void) { }
1409
EOF
1410
if check_linker_flags --whole-archive --no-whole-archive ; then
1411
    # GNU ld
1412
    arlibs_begin="-Wl,--whole-archive"
1413
    arlibs_end="-Wl,--no-whole-archive"
1414
elif check_linker_flags -z,allextract -z,defaultextract ; then
1415
    # Solaris ld
1416
    arlibs_begin"=-Wl,-z,allextract"
1417
    arlibs_end="-Wl,-z,defaultextract"
1418
elif check_linker_flags -all_load ; then
1419
    # Mac OS X
1420
    arlibs_begin="-all_load"
1421
    arlibs_end=""
1422
else
1423
    echo "Error: your linker does not support --whole-archive or -z."
1424
    echo "Please report to qemu-devel@nongnu.org"
1425
    exit 1
1426
fi
1427

  
1397 1428
if test "$mingw32" = "yes" ; then
1398 1429
  if test -z "$prefix" ; then
1399 1430
      prefix="c:/Program Files/Qemu"
......
1702 1733
;;
1703 1734
esac
1704 1735

  
1705
# Determine what linker flags to use to force archive inclusion
1706
check_linker_flags()
1707
{
1708
    w2=
1709
    if test "$2" ; then
1710
	w2=-Wl,$2
1711
    fi
1712
    $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null 2>/dev/null
1713
}
1714

  
1715
cat > $TMPC << EOF
1716
int main(void) { }
1717
EOF
1718
if check_linker_flags --whole-archive --no-whole-archive ; then
1719
    # GNU ld
1720
    echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_host_mak
1721
    echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_host_mak
1722
elif check_linker_flags -z,allextract -z,defaultextract ; then
1723
    # Solaris ld
1724
    echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_host_mak
1725
    echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_host_mak
1726
elif check_linker_flags -all_load ; then
1727
    # Mac OS X
1728
    echo "ARLIBS_BEGIN=-all_load" >> $config_host_mak
1729
    echo "ARLIBS_END=" >> $config_host_mak
1730
else
1731
    echo "Error: your linker does not support --whole-archive or -z."
1732
    echo "Please report to qemu-devel@nongnu.org"
1733
    exit 1
1734
fi
1735

  
1736 1736
tools=
1737 1737
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
1738 1738
  tools="qemu-img\$(EXESUF) $tools"
......
1772 1772
echo "LD=$ld" >> $config_host_mak
1773 1773
echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
1774 1774
echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
1775
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
1776
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
1775 1777
echo "EXESUF=$EXESUF" >> $config_host_mak
1776 1778
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
1777 1779
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak

Also available in: Unified diff