From fde75e3f11284103c893e6bf632531369ee0bb91 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 18 Nov 2020 18:17:15 +0000 Subject: [PATCH] Revert "Temporarily change jdk8 openj9 back to using vs2010 (#2227)" This reverts commit 5ba48d95f2bbb6a847399d0d6e8ac28a102ebe55 and reinstates https://github.com/AdoptOpenJDK/openjdk-build/pull/2191 --- build-farm/platform-specific-configurations/windows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index 339215f2d..dfaa1151b 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -89,7 +89,7 @@ then # https://github.com/AdoptOpenJDK/openjdk-build/issues/243 export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE" export PATH="/c/cygwin64/bin:/usr/bin:$PATH" - #Remove temporarily: TOOLCHAIN_VERSION="2013" + TOOLCHAIN_VERSION="2013" elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ] then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar" @@ -132,7 +132,7 @@ then export PATH="$PATH:/c/cygwin64/bin" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar --disable-ccache" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2013 --enable-openssl-bundling" - #Remove temporarily: TOOLCHAIN_VERSION="2013" + TOOLCHAIN_VERSION="2013" elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ] then TOOLCHAIN_VERSION="2013"