diff --git a/lib/buildit b/lib/buildit
index 0b1f6e5a..f8e31781 100755
--- a/lib/buildit
+++ b/lib/buildit
@@ -119,6 +119,21 @@ $CC *.o $RC_CFLAGS $LDSHARED_FLAGS $EXTRA_FLAGS
 
 #libtool -static -o libc++.a *.o
 
+# Create the link for the final library name, so that we can use this directory
+# as a link target for the tests.
+case $TRIPLE in
+    *-apple-*)
+        rm -f libc++.dylib
+        ln -s libc++.1.dylib libc++.dylib
+        ;;
+    *-*-mingw*)
+        ;;
+    *)
+        rm -f libc++.so
+        ln -s libc++.so.1 libc++.so
+        ;;
+esac
+
 if [ -z $RC_XBS ]
 then
     rm *.o