diff --git a/build/tools/build-llvm.sh b/build/tools/build-llvm.sh
index b80db6f..c6acd3b 100755
--- a/build/tools/build-llvm.sh
+++ b/build/tools/build-llvm.sh
@@ -353,8 +353,10 @@
 done
 
 test -z "$STRIP" && STRIP=strip
-$STRIP $TOOLCHAIN_BUILD_PREFIX/bin/*
-$STRIP $TOOLCHAIN_BUILD_PREFIX/lib/*
+find $TOOLCHAIN_BUILD_PREFIX/bin -maxdepth 1 -type f -exec $STRIP {} \;
+# Note that MacOSX strip generate the follow error on .dylib:
+# "symbols referenced by indirect symbol table entries that can't be stripped "
+find $TOOLCHAIN_BUILD_PREFIX/lib -maxdepth 1 -type f \( -name "*.dll" -o -name "*.so" \) -exec $STRIP {} \;
 
 # copy to toolchain path
 run copy_directory "$TOOLCHAIN_BUILD_PREFIX" "$TOOLCHAIN_PATH"
diff --git a/build/tools/package-release.sh b/build/tools/package-release.sh
index 40cd83d..ebd5d1e 100755
--- a/build/tools/package-release.sh
+++ b/build/tools/package-release.sh
@@ -492,8 +492,10 @@
             unpack_prebuilt llvm-$LLVM_VERSION-$SYSTEM "$DSTDIR" "$DSTDIR64"
         done
 
-        # Unpack ld.mcld
-        unpack_prebuilt ld.mcld-$SYSTEM "$DSTDIR" "$DSTDIR64"
+        if [ "$SYSTEM" != "windows" ]; then
+            # Unpack ld.mcld. Todo: windows
+            unpack_prebuilt ld.mcld-$SYSTEM "$DSTDIR" "$DSTDIR64"
+        fi
 
         # Unpack prebuilt ndk-stack and other host tools
         unpack_prebuilt ndk-stack-$SYSTEM "$DSTDIR" "$DSTDIR64" "yes"
diff --git a/build/tools/rebuild-all-prebuilt.sh b/build/tools/rebuild-all-prebuilt.sh
index 2013c4f..7f0c423 100755
--- a/build/tools/rebuild-all-prebuilt.sh
+++ b/build/tools/rebuild-all-prebuilt.sh
@@ -102,12 +102,12 @@
     HOST_FLAGS=$HOST_FLAGS" --darwin-ssh=$DARWIN_SSH"
 fi
 
-$PROGDIR/build-host-prebuilts.sh $HOST_FLAGS "$SRC_DIR"
-fail_panic "Could not build host prebuilts!"
 if [ "$ALSO_64" = "yes" -a "$TRY64" != "yes" ] ; then
     $PROGDIR/build-host-prebuilts.sh $HOST_FLAGS "$SRC_DIR" --try-64
     fail_panic "Could not build host prebuilts in 64-bit!"
 fi
+$PROGDIR/build-host-prebuilts.sh $HOST_FLAGS "$SRC_DIR"
+fail_panic "Could not build host prebuilts!"
 
 TARGET_FLAGS=$FLAGS