common/autoconf/spec.gmk.in

*** 122,139 ****
  LIBDL:=@LIBDL@
  
  # colon or semicolon
  PATH_SEP:=@PATH_SEP@
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
!   # On Windows, the Visual Studio toolchain needs the LIB and INCLUDE
!   # environment variables (in Windows path style), and the PATH needs to
!   # be adjusted to include Visual Studio tools (but this needs to be in
!   # cygwin/msys style).
    export PATH:=@VS_PATH@
-   export INCLUDE:=@VS_INCLUDE@
-   export LIB:=@VS_LIB@
  endif
  
  SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
  SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@
  
--- 122,137 ----
  LIBDL:=@LIBDL@
  
  # colon or semicolon
  PATH_SEP:=@PATH_SEP@
  
+ # Save the original path before replacing it with the Visual Studio tools
+ ORIGINAL_PATH:=@ORIGINAL_PATH@
  ifeq ($(OPENJDK_TARGET_OS), windows)
!   # On Windows, the Visual Studio toolchain needs the PATH to be adjusted
!   # to include Visual Studio tools (this needs to be in cygwin/msys style).
    export PATH:=@VS_PATH@
  endif
  
  SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
  SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@