aboutsummaryrefslogtreecommitdiff
path: root/build/android/Makefile
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-03-23 00:46:55 +0100
committerCraig Robbins <kde.psych@gmail.com>2015-03-23 14:11:39 +1000
commit15d9cd3a6f318a433e3a3b87068b0660e1b2dedc (patch)
tree884a9b56903dd721ec828a2342c7a54d7672acee /build/android/Makefile
parentc31c87adb5bacf26782362ea941bc137a6e6dec7 (diff)
downloadminetest-15d9cd3a6f318a433e3a3b87068b0660e1b2dedc.tar.gz
minetest-15d9cd3a6f318a433e3a3b87068b0660e1b2dedc.tar.bz2
minetest-15d9cd3a6f318a433e3a3b87068b0660e1b2dedc.zip
Fix Android build on 32 bit
Remove the --system=linux-x86_64 which isn't neccessary on 64 bit, as, when given no --system parameter, the standalone-toolchain.sh script figures out the platform on itself. Naturally, the hardcoded setting broke android building on 32 bit systems.
Diffstat (limited to 'build/android/Makefile')
-rw-r--r--build/android/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index 394b3a5e3..43ce24712 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -311,7 +311,7 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-openssl; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
- --install-dir=$${TOOLCHAIN} --system=linux-x86_64; \
+ --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
CC=${CROSS_PREFIX}gcc ./Configure android-${TARGET_ARCH} no-idea no-seed -no-sha0 -DL_ENDIAN;\
CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs; \
@@ -359,7 +359,7 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-leveldb; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
- --install-dir=$${TOOLCHAIN} --system=linux-x86_64; \
+ --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export CC=${CROSS_PREFIX}gcc; \
export CXX=${CROSS_PREFIX}g++; \
@@ -518,7 +518,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-curl; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
- --install-dir=$${TOOLCHAIN} --system=linux-x86_64; \
+ --install-dir=$${TOOLCHAIN}; \
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
export CC=${CROSS_PREFIX}gcc; \
export CXX=${CROSS_PREFIX}g++; \