Merge "Fix a help message in make-standalone-toolchain." into ndk-r11…

…-release
android · Mar 14, 2016 · cda448b · cda448b
2 parents 06da29d + 5902c79
commit cda448b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh
@@ -176,7 +176,13 @@ TOOLCHAIN_PATH="$NDK_DIR/toolchains/$TOOLCHAIN_NAME/prebuilt/$SYSTEM"
 if [ ! -d "$TOOLCHAIN_PATH" ] ; then
     echo "Could not find toolchain: $TOOLCHAIN_PATH"
     echo "Please use --toolchain=<name> with the name of a toolchain supported by the source NDK."
-    echo "Try one of: " `(cd "$NDK_DIR/toolchains" && ls)`
+    echo "Try one of: "
+    for tc in $(cd "$NDK_DIR/toolchains" && ls); do
+        if [ "$tc" != "llvm" ]; then
+            echo $tc
+            echo $tc | sed 's/-4.9$/-clang/'
+        fi
+    done
     exit 1
 fi