ref: 136e169c0105e700b1c04e1383f6b4d9041094a5
parent: a893e2231152216d5a6cd262a153f17d2ee1eb50
parent: 0f9c2dbb12742ea0bfc493156ae6454227878ebb
author: huili2 <[email protected]>
date: Fri Aug 15 05:12:15 EDT 2014
Merge pull request #1270 from mstorsjo/android-tool-detect Check for $(CXX).exe as well when checking for the android toolchain
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -47,7 +47,9 @@
SHLDFLAGS = -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
ifneq ($(CXX),$(wildcard $(CXX)))
+ifneq ($(CXX).exe,$(wildcard $(CXX).exe))
$(error Compiler not found, bad NDKROOT or ARCH?)
+endif
endif
STL_INCLUDES = \