From 4b326121b95c2993a8f75552fae364fbc0310d92 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 9 Jun 2023 12:23:23 -0300 Subject: [PATCH] Jenkins: Properly force new dynarec on architectures that require it --- .ci/build.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 145efb7dd..448b99160 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -348,10 +348,6 @@ then # Run build for the architecture. args= [ $strip -ne 0 ] && args="-t $args" - case $arch_universal in # workaround: force new dynarec on for ARM - arm*) cmake_flags_extra="-D NEW_DYNAREC=ON";; - *) cmake_flags_extra=;; - esac zsh -lc 'exec "'"$0"'" -n -b "universal slice" "'"$arch_universal"'" '"$args""$cmake_flags"' '"$cmake_flags_extra" status=$? @@ -677,7 +673,7 @@ rm -rf build case $arch in 32 | x86) cmake_flags_extra="$cmake_flags_extra -D ARCH=i386";; 64 | x86_64*) cmake_flags_extra="$cmake_flags_extra -D ARCH=x86_64";; - ARM32 | arm32) cmake_flags_extra="$cmake_flags_extra -D ARCH=arm";; + ARM32 | arm32) cmake_flags_extra="$cmake_flags_extra -D ARCH=arm -D NEW_DYNAREC=ON";; ARM64 | arm64) cmake_flags_extra="$cmake_flags_extra -D ARCH=arm64 -D NEW_DYNAREC=ON";; *) cmake_flags_extra="$cmake_flags_extra -D \"ARCH=$arch\"";; esac