summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKai Engert <kaie@kuix.de>2015-10-08 22:00:16 +0200
committerKai Engert <kaie@kuix.de>2015-10-08 22:00:16 +0200
commit65de92beba59851d063e4cef222aa08324ea3a4b (patch)
treedb6dc5ebe931b5a44d779d9eb7685f3d88ab2dea /Makefile
parent4620962287e073fd40f83cdb03654c5fb23d5291 (diff)
downloadnss-hg-65de92beba59851d063e4cef222aa08324ea3a4b.tar.gz
Removed hardcoded Android compiler version, and introduce an environment variable to control it.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 655c4d31b..bfedabe8f 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,11 @@ NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
#
ifeq ($(OS_TARGET),Android)
-NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) --target=arm-linux-androideabi --with-android-version=$(OS_TARGET_RELEASE)
+NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
+ --target=$(ANDROID_PREFIX) \
+ --with-android-version=$(OS_TARGET_RELEASE) \
+ --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
+ --with-android-platform=$(ANDROID_SYSROOT)
endif
ifdef BUILD_OPT
NSPR_CONFIGURE_OPTS += --disable-debug --enable-optimize