1 files changed, 9 insertions, 1 deletions
diff --git a/configure b/configure
index 14db108357..5f11464e23 100755
--- a/configure
+++ b/configure
@@ -1817,7 +1817,11 @@ esac
 # Determine what linker flags to use to force archive inclusion
 check_linker_flags()
 {
-    $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 -Wl,$2 >/dev/null 2>/dev/null
+    w2=
+    if test "$2" ; then
+	w2=-Wl,$2
+    fi
+    $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null 2>/dev/null
 }
 
 cat > $TMPC << EOF
@@ -1831,6 +1835,10 @@ elif check_linker_flags -z,allextract -z,defaultextract ; then
     # Solaris ld
     echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_mak
     echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_mak
+elif check_linker_flags -all_load ; then
+    # Mac OS X
+    echo "ARLIBS_BEGIN=-all_load" >> $config_mak
+    echo "ARLIBS_END=" >> $config_mak
 else
     echo "Error: your linker does not support --whole-archive or -z."
     echo "Please report to qemu-devel@nongnu.org"