mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-09-19 00:55:29 -04:00
build(fix): use proper targets
This commit is contained in:
parent
2e091dc3f3
commit
51ec1786d4
@ -1,9 +1,8 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
export TARGET=arm-linux-androideabi
|
||||
export TARGET=armv7a-linux-androideabi
|
||||
export TARGET_JDK=arm
|
||||
export NDK_PREBUILT_ARCH=arm
|
||||
|
||||
bash ci_build_global.sh
|
||||
|
||||
|
@ -6,7 +6,6 @@ else
|
||||
export TARGET=aarch64-linux-android
|
||||
fi
|
||||
export TARGET_JDK=aarch64
|
||||
export NDK_PREBUILT_ARCH=aarch64
|
||||
|
||||
bash ci_build_global.sh
|
||||
|
||||
|
@ -3,7 +3,6 @@ set -e
|
||||
|
||||
export TARGET=i686-linux-android
|
||||
export TARGET_JDK=x86
|
||||
export NDK_PREBUILT_ARCH=i686
|
||||
|
||||
bash ci_build_global.sh
|
||||
|
||||
|
@ -3,7 +3,6 @@ set -e
|
||||
|
||||
export TARGET=x86_64-linux-android
|
||||
export TARGET_JDK=x86_64
|
||||
export NDK_PREBUILT_ARCH=x86_64
|
||||
|
||||
bash ci_build_global.sh
|
||||
|
||||
|
@ -61,10 +61,8 @@ export CPPFLAGS=""
|
||||
export LDFLAGS=""
|
||||
|
||||
# Underlying compiler called by the wrappers
|
||||
# export thecc=$TOOLCHAIN/bin/$TARGET-gcc
|
||||
# export thecxx=$TOOLCHAIN/bin/$TARGET-g++
|
||||
export thecc=$TOOLCHAIN/bin/${NDK_PREBUILT_ARCH}-linux-android${API}-clang
|
||||
export thecxx=$TOOLCHAIN/bin/${NDK_PREBUILT_ARCH}-linux-android${API}-clang++
|
||||
export thecc=$TOOLCHAIN/bin/${TARGET}${API}-clang
|
||||
export thecxx=$TOOLCHAIN/bin/${TARGET}${API}-clang++
|
||||
|
||||
# Configure and build.
|
||||
export AR=$TOOLCHAIN/bin/llvm-ar
|
||||
|
Loading…
x
Reference in New Issue
Block a user