Skip to content

Commit

Permalink
Move capstone detection and configargs back to linux.sh
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart X Addison <sxa@redhat.com>
  • Loading branch information
sxa committed Oct 5, 2023
1 parent aa17028 commit 2a1bb58
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
4 changes: 2 additions & 2 deletions build-farm/platform-specific-configurations/linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,9 @@ 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 ]; then
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} --with-capstone=/usr/local"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-hsdis-bundling --with-hsdis=capstone --with-capstone=/usr/local"
fi
fi

Expand Down
15 changes: 0 additions & 15 deletions sbin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -506,7 +492,6 @@ configureFreetypeLocation() {
configureCommandParameters() {
configureVersionStringParameter
configureBootJDKConfigureParameter
configureCapstoneBuildParameter
configureShenandoahBuildParameter
configureMacOSCodesignParameter
configureDebugParameters
Expand Down

0 comments on commit 2a1bb58

Please sign in to comment.