[zorg] r344370 - [Zorg] Explicitly use `-stdlib=libstdc++` for Android.

[Dan Albert via llvm-commits]

Author: danalbert
Date: Fri Oct 12 10:13:28 2018
New Revision: 344370

URL: http://llvm.org/viewvc/llvm-project?rev=344370&view=rev
Log:
[Zorg] Explicitly use `-stdlib=libstdc++` for Android.

Summary:
This builder uses an old version of the NDK with a just-built version
of the Clang. This builder is making use of an NDK standalone
toolchain. For older NDKs, these toolchins have the C++ stdlib headers
and libraries installed to the GNU stdlib paths.

This causes an issue when I try to update the default -stdlib for
Android targets in Clang as this builder will begin looking in the
libc++ paths when it does not have an STL available at that path.

Explicitly use `-stdlib=libstdc++` to keep the old tools working with
a new Clang until this builder is using an NDK new enough to not need
it (NDK r19).

Reviewers: eugenis

Reviewed By: eugenis

Subscribers: srhines, llvm-commits

Tags: #zorg

Differential Revision: https://reviews.llvm.org/D53182

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=344370&r1=344369&r2=344370&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Oct 12 10:13:28 2018
@@ -43,7 +43,7 @@ function configure_android { # ARCH trip
   local ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch
   local ANDROID_LIBRARY_OUTPUT_DIR=$(ls -d $ROOT/llvm_build64/lib/clang/* | tail -1)
   local ANDROID_EXEC_OUTPUT_DIR=$ROOT/llvm_build64/bin
-  local ANDROID_FLAGS="--target=$_triple --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
+  local ANDROID_FLAGS="--target=$_triple -stdlib=libstdc++ --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
 
   # Always clobber android build tree.
   # It has a hidden dependency on clang (through CXX) which is not known to