--- old/common/autoconf/flags.m4	2018-05-24 21:03:19.275836200 +0100
+++ new/common/autoconf/flags.m4	2018-05-24 21:03:18.537494600 +0100
@@ -476,7 +476,7 @@
     # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
     # studio.
     if test "x$TOOLCHAIN_VERSION" = "x2010"; then
-      CXXFLAGS_JDK="$CXXFLAGS_JDK \
+      CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
           -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
     fi
   fi
--- old/common/autoconf/generated-configure.sh	2018-05-24 21:03:25.488754300 +0100
+++ new/common/autoconf/generated-configure.sh	2018-05-24 21:03:24.716828500 +0100
@@ -4305,7 +4305,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1526910855
+DATE_WHEN_GENERATED=1527191982
 
 ###############################################################################
 #
@@ -41490,7 +41490,7 @@
     # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
     # studio.
     if test "x$TOOLCHAIN_VERSION" = "x2010"; then
-      CXXFLAGS_JDK="$CXXFLAGS_JDK \
+      CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
           -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
     fi
   fi