summaryrefslogtreecommitdiff
path: root/app/openssl/check-all-builds.sh
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-26 09:46:26 +0200
committerParménides GV <parmegv@sdf.org>2014-09-26 09:46:26 +0200
commit394451dbae3e71282611058e00b5fd16c865f147 (patch)
tree17b71034d9350a2848603f5edf0a8b13025909be /app/openssl/check-all-builds.sh
parent644fd02cf8da95b0b5a99fb9f2142628dd27f7c2 (diff)
Revert "Updated native subprojects from ics-openvpn."
This reverts commit d0e7ba3029b2fd42582413aa95773fe7dbdede90. I'll postpone this work for the next cycle, it's not trivial because it doesn't link properly.
Diffstat (limited to 'app/openssl/check-all-builds.sh')
-rwxr-xr-xapp/openssl/check-all-builds.sh16
1 files changed, 5 insertions, 11 deletions
diff --git a/app/openssl/check-all-builds.sh b/app/openssl/check-all-builds.sh
index 9743872a..cff2ba5d 100755
--- a/app/openssl/check-all-builds.sh
+++ b/app/openssl/check-all-builds.sh
@@ -143,7 +143,7 @@ esac
# NOTE: x86_64 is not ready yet, while the toolchain is in
# prebuilts/ it doesn't have a sysroot which means it requires
# a platform build to get Bionic and stuff.
-ANDROID_ARCHS="arm arm64 x86 x86_64 mips"
+ANDROID_ARCHS="arm x86 mips"
BUILD_TYPES=
for ARCH in $ANDROID_ARCHS; do
@@ -311,14 +311,11 @@ get_build_arch () {
# Out: GNU configuration target (e.g. arm-linux-androideabi)
get_build_arch_target () {
case $1 in
- arm64)
- echo "aarch64-linux-android"
- ;;
arm)
echo "arm-linux-androideabi"
;;
x86)
- echo "x86_64-linux-android"
+ echo "i686-linux-android"
;;
x86_64)
echo "x86_64-linux-android"
@@ -332,8 +329,8 @@ get_build_arch_target () {
esac
}
-GCC_VERSION=4.8
-CLANG_VERSION=3.2
+GCC_VERSION=4.7
+CLANG_VERSION=3.1
get_prebuilt_gcc_dir_for_arch () {
local arch=$1
@@ -344,9 +341,6 @@ get_prebuilt_gcc_dir_for_arch () {
x86_64)
arch=x86
;;
- arm64)
- arch=aarch64
- ;;
esac
echo "$ANDROID_BUILD_TOP/prebuilts/gcc/$ANDROID_HOST_TAG/$arch/$target-$GCC_VERSION"
}
@@ -403,7 +397,7 @@ get_build_compiler () {
# Force -m32 flag when needed for 32-bit builds.
case $1 in
- *-x86|*-generic32)
+ *-linux-x86|*-darwin-x86|*-generic32)
result="$result -m32"
;;
esac