Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build OpenJ9 Windows jdk19+ with VS2022, and disable ccache #3251

Merged
merged 2 commits into from
May 18, 2023
Merged

Build OpenJ9 Windows jdk19+ with VS2022, and disable ccache #3251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c213222
Build OpenJ9 Windows jdk19+ with VS2022, and disable ccache
pshipton Feb 14, 2023
4888cf5
Merge branch 'master' into vs2022
sxa May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions build-farm/platform-specific-configurations/windows.sh
View file
Open in desktop
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