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:
commit
136e169c01
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user