Skip to content

Commit 7412a00

Browse files
committed
windows: bump JDK11 x86 build to use VS2019
1 parent 4563ad8 commit 7412a00

File tree

1 file changed

+1
-12
lines changed
  • build-farm/platform-specific-configurations

1 file changed

+1
-12
lines changed

build-farm/platform-specific-configurations/windows.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,7 @@ then
139139
TOOLCHAIN_VERSION="2013"
140140
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
141141
export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH"
142-
elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ]
143-
then
144-
export TOOLCHAIN_VERSION="2017"
145-
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
146-
elif [ "$JAVA_FEATURE_VERSION" -gt 11 ]
142+
elif [ "$JAVA_FEATURE_VERSION" -ge 11 ]
147143
then
148144
TOOLCHAIN_VERSION="2019"
149145
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
@@ -166,13 +162,6 @@ then
166162
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache"
167163
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.9.1"
168164
TOOLCHAIN_VERSION="2017"
169-
elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ]
170-
then
171-
TOOLCHAIN_VERSION="2013"
172-
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
173-
elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ]
174-
then
175-
export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3"
176165
elif [ "$JAVA_FEATURE_VERSION" -ge 11 ]
177166
then
178167
TOOLCHAIN_VERSION="2019"

0 commit comments

Comments
 (0)