diff -r 7129b977c4af -r 01cc48ed67f3 common/autoconf/libraries.m4
--- a/common/autoconf/libraries.m4	Fri May 04 11:00:26 2018 +0100
+++ b/common/autoconf/libraries.m4	Wed May 16 15:52:51 2018 -0700
@@ -994,10 +994,9 @@
 AC_DEFUN_ONCE([LIB_SETUP_ON_WINDOWS],
 [
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    TOOLCHAIN_SETUP_MSVCR_DLL
+    TOOLCHAIN_SETUP_VS_RUNTIME_DLLS
     BASIC_DEPRECATED_ARG_WITH([dxsdk])
     BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
     BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
   fi
-  AC_SUBST(MSVCR_DLL)
 ])