[zorg] r316039 - Set LLVM_BINUTILS_INCDIR on sanitizer-android.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Tue Oct 17 15:16:18 2017
New Revision: 316039

URL: http://llvm.org/viewvc/llvm-project?rev=316039&view=rev
Log:
Set LLVM_BINUTILS_INCDIR on sanitizer-android.

It's needed to build the gold plugin, which is needed to test cfi.

As it turns out, we are not testing cfi.


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

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh?rev=316039&r1=316038&r2=316039&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Tue Oct 17 15:16:18 2017
@@ -22,6 +22,10 @@ STAGE1_CLOBBER="llvm_build64 compiler_rt
 LLVM=$ROOT/llvm
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_PARALLEL_LINK_JOBS=20"
 
+if [ -e /usr/include/plugin-api.h ]; then
+  CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_BINUTILS_INCDIR=/usr/include"
+fi
+
 export CCACHE_DIR=$ROOT/ccache
 export CCACHE_COMPILERCHECK=content
 if ccache -sM 20 ; then