1.1 --- a/common/autoconf/toolchain.m4 Thu Apr 05 08:14:51 2018 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Fri Apr 06 04:13:09 2018 -0700
1.3 @@ -223,6 +223,12 @@
1.4 # it for DLL resolution in runtime.
1.5 if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
1.6 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
1.7 + # Reset path to VS_PATH. It will include everything that was on PATH at the time we
1.8 + # ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV.
1.9 + PATH="$VS_PATH"
1.10 + # The microsoft toolchain also requires INCLUDE and LIB to be set.
1.11 + export INCLUDE="$VS_INCLUDE"
1.12 + export LIB="$VS_LIB"
1.13 fi
1.14
1.15 # autoconf magic only relies on PATH, so update it if tools dir is specified
