Merge pull request #1270 from mstorsjo/android-tool-detect

Check for $(CXX).exe as well when checking for the android toolchain
This commit is contained in:
huili2 2014-08-15 09:12:15 +08:00
commit 136e169c01

View File

@ -47,8 +47,10 @@ LDFLAGS += --sysroot=$(SYSROOT)
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 = \
-I$(NDKROOT)/sources/cxx-stl/stlport/stlport