Skip to content

Commit

Permalink
Build OpenJ9 Windows jdk19+ with VS2022, and disable ccache (#3251)
Browse files Browse the repository at this point in the history
OpenJ9 was missing the change to disable ccache for all versions.

Issue eclipse-openj9/openj9#16701

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com>
  • Loading branch information
pshipton and sxa authored May 18, 2023
1 parent 8d10fb6 commit a971b70
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions build-farm/platform-specific-configurations/windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,12 @@ then
then
export HAS_AUTOCONF=1
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"

if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
then
export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE"
export PATH="$PATH:/c/cygwin64/bin"
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
TOOLCHAIN_VERSION="2017"
elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ]
Expand All @@ -172,10 +171,14 @@ then
elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ]
then
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
elif [ "$JAVA_FEATURE_VERSION" -ge 11 ]
elif [ "$JAVA_FEATURE_VERSION" -lt 19 ]
then
TOOLCHAIN_VERSION="2019"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
elif [ "$JAVA_FEATURE_VERSION" -ge 19 ]
then
TOOLCHAIN_VERSION="2022"
export BUILD_ARGS="${BUILD_ARGS} --skip-freetype"
fi

CUDA_VERSION=9.0
Expand Down

0 comments on commit a971b70

Please sign in to comment.