Browse Source

Use clang to compile for Android. Except on mips64, where we have to stick to gcc.

next
Frank Denis 7 years ago
parent
commit
eaf19f25d0
  1. 2
      dist-build/android-build.sh
  2. 4
      dist-build/android-mips32.sh
  3. 2
      dist-build/android-mips64.sh

2
dist-build/android-build.sh

@ -31,6 +31,8 @@ export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}"
export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
export CC=${CC:-"${HOST_COMPILER}-clang"}
rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
echo

4
dist-build/android-mips32.sh

@ -1,4 +1,4 @@
#!/bin/sh
export TARGET_ARCH=mips32
export CFLAGS="-Os -march=${TARGET_ARCH}"
ARCH=mips HOST_COMPILER=mipsel-linux-android "$(dirname "$0")/android-build.sh"
export CFLAGS="-Os"
ARCH=mips HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"

2
dist-build/android-mips64.sh

@ -1,4 +1,4 @@
#!/bin/sh
export TARGET_ARCH=mips64r6
export CFLAGS="-Os -march=${TARGET_ARCH}"
NDK_PLATFORM_COMPAT=android-21 ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"
CC="mips64el-linux-android-gcc" NDK_PLATFORM_COMPAT=android-21 ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"

Loading…
Cancel
Save