From: sapier <Sapier at GMX dot net>
Date: Wed, 7 Jan 2015 23:11:00 +0000 (+0100)
Subject: Fix armv7 using arm arch while arm uses armv7
X-Git-Tag: 0.4.12~130
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=04d4a00393a6eaa6b2c7681b2cd799dc2d2de3fb;p=oweals%2Fminetest.git

Fix armv7 using arm arch while arm uses armv7
---

diff --git a/build/android/Makefile b/build/android/Makefile
index ae1165157..e160716d3 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -36,7 +36,7 @@ TARGET_ABI = armeabi
 TARGET_LIBDIR = armeabi
 TARGET_TOOLCHAIN = arm-linux-androideabi-
 TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
-TARGET_ARCH = armv7
+TARGET_ARCH = arm
 CROSS_PREFIX = arm-linux-androideabi-
 COMPILER_VERSION = 4.8
 HAVE_LEVELDB = 1
@@ -52,7 +52,7 @@ HAVE_LEVELDB = 1
 #						-mfloat-abi=hard -march=armv7-a
 #TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 #TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
-#TARGET_ARCH = arm
+#TARGET_ARCH = armv7
 #CROSS_PREFIX = arm-linux-androideabi-
 #COMPILER_VERSION = 4.8
 #HAVE_LEVELDB = 1