Index: foo/libcxx/lib/buildit
===================================================================
--- foo.orig/libcxx/lib/buildit
+++ foo/libcxx/lib/buildit
@@ -123,19 +123,20 @@ case $TRIPLE in
     SOEXT=so
     LDSHARED_FLAGS="-o libc++.so.1.0 \
         -shared -nodefaultlibs -Wl,-soname,libc++.so.1 \
-        -lpthread -lrt -lc -lstdc++"
+        -lpthread -lrt -lc -L../../libcxxabi/lib"
+    EXTRA_FLAGS="$EXTRA_FLAGS -DLIBCXXABI"
     ;;
 esac
 
 if [ -z "$RC_XBS" ]
 then
-    rm -f libc++.1.$SOEXT*
+    rm -f libc++.a
 fi
 
 set -x
 
 for FILE in ../src/*.cpp; do
-    $CXX -c -g -Os $RC_CFLAGS $EXTRA_FLAGS -I../include $FILE
+    $CXX -c -g -Os $RC_CFLAGS $EXTRA_FLAGS -I../include -I../../libcxxabi/include $FILE
 done
 case $TRIPLE in
   *-*-mingw*)
@@ -144,8 +145,12 @@ case $TRIPLE in
   done
   ;;
 esac
+for i in *.o; do
+	mv $i libcxx-$i;
+done;
+ar x ../../libcxxabi/lib/libc++abi.a
+ar rcs libc++.a *.o
 $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