From 2c84718ecdfdac6f18c1daaca51a4edb204bb6d5 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 5 Oct 2023 19:05:56 +0100 Subject: [PATCH] Shut up linter Signed-off-by: Stewart X Addison --- build-farm/platform-specific-configurations/linux.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index fb80fc020..289f0d12e 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -338,9 +338,12 @@ elif [ -r /usr/bin/gcc-7 ]; then [ -r /usr/bin/g++-7 ] && export CXX=/usr/bin/g++-7 fi -if [ "$JAVA_FEATURE_VERSION" -ge 20 -a "${ARCHITECTURE}" = "x64" -o "${ARCHITECTURE}" = "aarch64" -a "${VARIANT}" == "${BUILD_VARIANT_TEMURIN}" ]; then - if [ -r /usr/local/lib/libcapstone.so.4 ]; then - export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-hsdis-bundling --with-hsdis=capstone --with-capstone=/usr/local" +if [ "$JAVA_FEATURE_VERSION" -ge 20 ] && [ "${VARIANT}" == "${BUILD_VARIANT_TEMURIN}" ]; then + # hsdis+capstone only supported on these two in openjdk + if [ "${ARCHITECTURE}" = "x64" ] || [ "${ARCHITECTURE}" = "aarch64" ]; then + if [ -r /usr/local/lib/libcapstone.so.4 ]; then + export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-hsdis-bundling --with-hsdis=capstone --with-capstone=/usr/local" + fi fi fi