cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't build arm and armv7 android targets in the same directory

Browse Source
This commit is contained in:
Frank Denis 2015-02-08 10:34:39 +01:00
parent 046df856fa
commit 0022a42f5a
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist-build/android-arm.sh
View File

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
export CFLAGS="-Os -mthumb -marm -march=armv6" export TARGET_ARCH=armv6
TARGET_ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh" export CFLAGS="-Os -mthumb -marm -march=${TARGET_ARCH}"
ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh"

5
dist-build/android-armv7.sh
View File

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
export CFLAGS="-Os -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=armv7-a" export TARGET_ARCH=armv7-a
TARGET_ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh" export CFLAGS="-Os -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=${TARGET_ARCH}"
ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh"

4
dist-build/android-build.sh
View File

@ -11,7 +11,7 @@ if [ ! -f ./configure ]; then
exit 1 exit 1
fi fi
if [ "x$TARGET_ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x' ]; then if [ "x$TARGET_ARCH" = 'x' ] || [ "x$ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x' ]; then
echo "You shouldn't use android-build.sh directly, use android-[arch].sh instead" echo "You shouldn't use android-build.sh directly, use android-[arch].sh instead"
exit 1 exit 1
fi fi
@ -26,7 +26,7 @@ export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}" rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
bash $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-14}" \ bash $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-14}" \
--arch="$TARGET_ARCH" \ --arch="$ARCH" \
--install-dir="$TOOLCHAIN_DIR" && \ --install-dir="$TOOLCHAIN_DIR" && \
./configure --host="${HOST_COMPILER}" \ ./configure --host="${HOST_COMPILER}" \
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" \ --with-sysroot="${TOOLCHAIN_DIR}/sysroot" \

5
dist-build/android-mips.sh
View File

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

5
dist-build/android-x86.sh
View File

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