TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-19 09:04:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

build(fix): use proper targets

Browse Source
This commit is contained in:
Mathias-Boulay 2024-04-15 10:46:21 +02:00
parent 2e091dc3f3
commit 51ec1786d4
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci_build_arch_aarch32.sh
View File

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
set -e set -e
export TARGET=arm-linux-androideabi export TARGET=armv7a-linux-androideabi
export TARGET_JDK=arm export TARGET_JDK=arm
export NDK_PREBUILT_ARCH=arm
bash ci_build_global.sh bash ci_build_global.sh

1
ci_build_arch_aarch64.sh
View File

@ -6,7 +6,6 @@ else
export TARGET=aarch64-linux-android export TARGET=aarch64-linux-android
fi fi
export TARGET_JDK=aarch64 export TARGET_JDK=aarch64
export NDK_PREBUILT_ARCH=aarch64
bash ci_build_global.sh bash ci_build_global.sh

1
ci_build_arch_x86.sh
View File

@ -3,7 +3,6 @@ set -e
export TARGET=i686-linux-android export TARGET=i686-linux-android
export TARGET_JDK=x86 export TARGET_JDK=x86
export NDK_PREBUILT_ARCH=i686
bash ci_build_global.sh bash ci_build_global.sh

1
ci_build_arch_x86_64.sh
View File

@ -3,7 +3,6 @@ set -e
export TARGET=x86_64-linux-android export TARGET=x86_64-linux-android
export TARGET_JDK=x86_64 export TARGET_JDK=x86_64
export NDK_PREBUILT_ARCH=x86_64
bash ci_build_global.sh bash ci_build_global.sh

6
setdevkitpath.sh
View File

@ -61,10 +61,8 @@ export CPPFLAGS=""
export LDFLAGS="" export LDFLAGS=""
# Underlying compiler called by the wrappers # Underlying compiler called by the wrappers
# export thecc=$TOOLCHAIN/bin/$TARGET-gcc export thecc=$TOOLCHAIN/bin/${TARGET}${API}-clang
# export thecxx=$TOOLCHAIN/bin/$TARGET-g++ export thecxx=$TOOLCHAIN/bin/${TARGET}${API}-clang++
export thecc=$TOOLCHAIN/bin/${NDK_PREBUILT_ARCH}-linux-android${API}-clang
export thecxx=$TOOLCHAIN/bin/${NDK_PREBUILT_ARCH}-linux-android${API}-clang++
# Configure and build. # Configure and build.
export AR=$TOOLCHAIN/bin/llvm-ar export AR=$TOOLCHAIN/bin/llvm-ar