diff --git a/build/tools/build-llvm.sh b/build/tools/build-llvm.sh
index e4c19c1..f4daf9e 100755
--- a/build/tools/build-llvm.sh
+++ b/build/tools/build-llvm.sh
@@ -238,6 +238,7 @@
     --with-bug-report-url=$DEFAULT_ISSUE_TRACKER_URL \
     --enable-targets=arm,mips,x86 \
     --enable-optimized \
+    --with-binutils-include=$SRC_DIR/binutils/binutils-$DEFAULT_BINUTILS_VERSION/include \
     $EXTRA_CONFIG_FLAGS
 fail_panic "Couldn't configure llvm toolchain"
 
@@ -317,8 +318,8 @@
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/*.a
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/*.la
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/pkgconfig
-rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/lib*.so
-rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/lib*.dylib
+rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/lib[cp]*.so
+rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/lib[cp]*.dylib
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/B*.so
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/B*.dylib
 rm -rf $TOOLCHAIN_BUILD_PREFIX/lib/LLVMH*.so