[compiler-rt] r202793 - [asan] Fix Android configure/make build.

[Evgeniy Stepanov]

Author: eugenis
Date: Tue Mar  4 01:17:38 2014
New Revision: 202793

URL: http://llvm.org/viewvc/llvm-project?rev=202793&view=rev
Log:
[asan] Fix Android configure/make build.

Mirror recent cmake changes in the configure/make build system.

Modified:
    compiler-rt/trunk/make/platform/clang_linux.mk

Modified: compiler-rt/trunk/make/platform/clang_linux.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=202793&r1=202792&r2=202793&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_linux.mk (original)
+++ compiler-rt/trunk/make/platform/clang_linux.mk Tue Mar  4 01:17:38 2014
@@ -110,9 +110,10 @@ ANDROID_COMMON_FLAGS := -target arm-linu
 	--sysroot=$(LLVM_ANDROID_TOOLCHAIN_DIR)/sysroot \
 	-B$(LLVM_ANDROID_TOOLCHAIN_DIR)
 CFLAGS.asan-arm-android := $(CFLAGS) -fPIC -fno-builtin \
-	$(ANDROID_COMMON_FLAGS) -fno-rtti
+	$(ANDROID_COMMON_FLAGS) -fno-rtti \
+	-I$(ProjSrcRoot)/third_party/android/include
 LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \
-	-Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs
+	-lstdc++ -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs
 
 # Use our stub SDK as the sysroot to support more portable building. For now we
 # just do this for the core module, because the stub SDK doesn't have