Skip to content

Commit 7ab6e32

Browse files
committed
Move capstone detection and configargs back to linux.sh
Signed-off-by: Stewart X Addison <[email protected]>
1 parent aa17028 commit 7ab6e32

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

sbin/build.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,6 @@ configureShenandoahBuildParameter() {
9090
fi
9191
}
9292

93-
# capstone disassembler support is available in JDK19+
94-
configureCapstoneBuildParameter() {
95-
if [[ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 19 && "${BUILD_CONFIG[OS_KERNEL_NAME]}" = "linux" ]]; then
96-
# Ref: https://github.com/adoptium/jdk21/blob/c86f4dea9529640cd3234c5cad2f36f3201b1385/make/Hsdis.gmk#L45
97-
if [ "${ARCHITECTURE}" = "x64" -o "${ARCHITECTURE}" = "aarch64" ]; then
98-
echo Configuring with hsdis capstone bundling support
99-
addConfigureArg "--enable-hsdis-bundling" ""
100-
addConfigureArg "--with-hsdis=" "capstone"
101-
addConfigureArg "--with-capstone=" "/usr/local"
102-
else
103-
echo Not configuring with hsdis/capstone support as we are not building on x64 or aarch64
104-
fi
105-
fi
106-
}
10793
# Configure reproducible build
10894
# jdk-17 and jdk-19+ support reproducible builds
10995
configureReproducibleBuildParameter() {
@@ -506,7 +492,6 @@ configureFreetypeLocation() {
506492
configureCommandParameters() {
507493
configureVersionStringParameter
508494
configureBootJDKConfigureParameter
509-
configureCapstoneBuildParameter
510495
configureShenandoahBuildParameter
511496
configureMacOSCodesignParameter
512497
configureDebugParameters

0 commit comments

Comments
 (0)