diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index e8fbc07415..084f9c7314 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -78,7 +78,6 @@ then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_32-VS2013 --enable-openssl-bundling" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar" # https://github.com/AdoptOpenJDK/openjdk-build/issues/243 export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE" @@ -97,7 +96,6 @@ then if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then TOOLCHAIN_VERSION="2013" - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH" elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ] then @@ -116,11 +114,9 @@ then if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ] then export HAS_AUTOCONF=1 - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" 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} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar --disable-ccache" @@ -128,11 +124,9 @@ then elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ] then TOOLCHAIN_VERSION="2013" - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar" elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-freemarker-jar=/cygdrive/c/openjdk/freemarker.jar" elif [ "$JAVA_FEATURE_VERSION" -ge 11 ] then @@ -156,16 +150,13 @@ then TOOLCHAIN_VERSION="2013" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" elif [ "$JAVA_FEATURE_VERSION" -ge 11 ] then @@ -175,6 +166,8 @@ then fi fi +export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.10.2" + if [ ! -z "${TOOLCHAIN_VERSION}" ]; then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-version=${TOOLCHAIN_VERSION}" fi