Support Clang as a `cross-tool' and use it under Android.

[mdw-cross] / android-cross-setup.sh.in

diff --git a/android-cross-setup.sh.in b/android-cross-setup.sh.in
index f7186de..77d5599 100644 (file)
--- a/android-cross-setup.sh.in
+++ b/android-cross-setup.sh.in
@@ -3,7 +3,7 @@
 ANDROID_NDK_TARGETARCH=@arch@
 . $CROSSDIR/etc/android.sh
 CONFIG_SITE=$CROSSDIR/etc/android-cross-config.site
-PATH=$PATH:$ANDROID_NDK_TOOLS; export PATH
+PATH=$PATH:$ANDROID_NDK_TOOLS:$ANDROID_NDK_LLVM; export PATH
 
 CROSS_gcc_FLAGS=" --sysroot=$ANDROID_NDK_SYSROOT \
        -D__ANDROID_API__=$ANDROID_NDK_TARGETVER \
@@ -13,5 +13,11 @@ CROSS_gcc_FLAGS=" --sysroot=$ANDROID_NDK_SYSROOT \
 CROSS_gxx_FLAGS=$CROSS_gcc_FLAGS
 export CROSS_gcc_FLAGS CROSS_gxx_FLAGS
 
+CROSS_clang_TOOL=$ANDROID_NDK_CLANGARCH$ANDROID_NDK_TARGETVER-clang
+CROSS_clang_FLAGS=""
+CROSS_clangxx_TOOL=$CROSS_clang_TOOL++ CROSS_clangxx_FLAGS=$CROSS_clang_FLAGS
+export CROSS_clang_TOOL CROSS_clang_FLAGS
+export CROSS_clangxx_TOOL CROSS_clangxx_FLAGS
+
 PKG_CONFIG_PATH=$CROSS_PREFIX/lib/pkgconfig:/usr/lib/pkgconfig
 export PKG_CONFIG_PATH