From dcd15c6faebf0d13c68b1acabba886b61f78355d Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 27 Jan 2024 13:05:18 -0500 Subject: [PATCH] Revert "arm fixes" This reverts commit 63f533da80b2a2a9e37a615ab7af09c1610bf8a2. --- scripts/build_linux_zig.sh | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/scripts/build_linux_zig.sh b/scripts/build_linux_zig.sh index 4eaaeec9..ac51a0b9 100755 --- a/scripts/build_linux_zig.sh +++ b/scripts/build_linux_zig.sh @@ -24,14 +24,17 @@ case "$ARCH" in x86_64) apt -y install libc6-amd64-cross ln -s /usr/x86_64-linux-gnu/lib/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 + export TARGET=${ARCH}-linux-gnu.2.17 ;; aarch64) apt -y install libc6-arm64-cross ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1 + export TARGET=${ARCH}-linux-gnu.2.17 ;; arm) apt -y install libc6-armhf-cross ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3 + export TARGET=${ARCH}-linux-gnueabihf.2.17 ;; esac @@ -51,14 +54,7 @@ export CC=zig_cc export CXX=zig_cxx export CHOST=${ARCH} -case "$ARCH" in - arm) - export ZIG_TARGET=${ARCH}-linux-gnueabihf.2.17 - ;; - *) - export ZIG_TARGET=${ARCH}-linux-gnu.2.17 - ;; -esac +export ZIG_TARGET=${TARGET} echo "::endgroup::" ######## @@ -86,14 +82,7 @@ wget -q https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1w.tar. tar -xf OpenSSL*.tar.gz rm *.tar.gz cd openssl-OpenSSL* -case "$ARCH" in - arm) - ./Configure linux-generic32 no-shared --prefix=${DEPSDIR} --openssldir=${DEPSDIR} - ;; - *) - ./Configure linux-${ARCH} no-shared --prefix=${DEPSDIR} --openssldir=${DEPSDIR} - ;; -esac +./Configure linux-${ARCH} no-shared --prefix=${DEPSDIR} --openssldir=${DEPSDIR} make -j4 make install_sw