From 7ab6e32ef2b8e4a5bd319d922f13e963396f0265 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 5 Oct 2023 18:15:11 +0100 Subject: [PATCH] Move capstone detection and configargs back to linux.sh Signed-off-by: Stewart X Addison --- sbin/build.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index 4ff7895a14..23f524e4be 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -90,20 +90,6 @@ configureShenandoahBuildParameter() { fi } -# capstone disassembler support is available in JDK19+ -configureCapstoneBuildParameter() { - if [[ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 19 && "${BUILD_CONFIG[OS_KERNEL_NAME]}" = "linux" ]]; then - # Ref: https://github.com/adoptium/jdk21/blob/c86f4dea9529640cd3234c5cad2f36f3201b1385/make/Hsdis.gmk#L45 - if [ "${ARCHITECTURE}" = "x64" -o "${ARCHITECTURE}" = "aarch64" ]; then - echo Configuring with hsdis capstone bundling support - addConfigureArg "--enable-hsdis-bundling" "" - addConfigureArg "--with-hsdis=" "capstone" - addConfigureArg "--with-capstone=" "/usr/local" - else - echo Not configuring with hsdis/capstone support as we are not building on x64 or aarch64 - fi - fi -} # Configure reproducible build # jdk-17 and jdk-19+ support reproducible builds configureReproducibleBuildParameter() { @@ -506,7 +492,6 @@ configureFreetypeLocation() { configureCommandParameters() { configureVersionStringParameter configureBootJDKConfigureParameter - configureCapstoneBuildParameter configureShenandoahBuildParameter configureMacOSCodesignParameter configureDebugParameters