Merge pull request kivy#161 from kivy/r9

tito · tito · commit 438580f66641 · 2013-10-11T02:42:57.000-07:00
r9 fix
diff --git a/distribute.sh b/distribute.sh
@@ -152,15 +152,16 @@ function push_arm() {
 		PYPLATFORM="linux"
 	fi
 
-	if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
-		export TOOLCHAIN_PREFIX=arm-eabi
-		export TOOLCHAIN_VERSION=4.4.0
-	else
-		#if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
-		# assume this toolchain is the same for all the next ndk... until a new one is out.
-		export TOOLCHAIN_PREFIX=arm-linux-androideabi
-		export TOOLCHAIN_VERSION=4.4.3
-	fi
+    if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
+        export TOOLCHAIN_PREFIX=arm-eabi
+        export TOOLCHAIN_VERSION=4.4.0
+    elif [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X${ANDROIDNDKVER:0:2}" == "Xr8" ]; then
+        export TOOLCHAIN_PREFIX=arm-linux-androideabi
+        export TOOLCHAIN_VERSION=4.4.3
+    elif  [ "X${ANDROIDNDKVER}" == "Xr9" ]; then
+            export TOOLCHAIN_PREFIX=arm-linux-androideabi
+            export TOOLCHAIN_VERSION=4.8
+    fi
 
 	export PATH="$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86/bin/:$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86_64/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
 
diff --git a/src/tools/liblink b/src/tools/liblink
@@ -73,6 +73,7 @@ f.close()
 
 sys.exit(subprocess.call([
     environ.get('LD'), '-r',
-    '-o', output + '.o', '-arch',
-    environ.get('ARCH')] + objects))
+    '-o', output + '.o'
+    #, '-arch', environ.get('ARCH')
+    ] + objects))
 
