changeset 1313:f3c96aea372d

8072107: New dependency introduced by deploy.dll and awt.dll (msvcp100.dll) Reviewed-by: ihse
author erikj
date Thu, 05 Feb 2015 14:55:30 +0100
parents 34e490baa2fb
children b3d5aeadac2d
files common/autoconf/flags.m4 common/autoconf/generated-configure.sh
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/flags.m4	Wed Jan 28 08:14:14 2015 -0800
+++ b/common/autoconf/flags.m4	Thu Feb 05 14:55:30 2015 +0100
@@ -572,7 +572,7 @@
     # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
     # studio.
     if test "x$TOOLCHAIN_VERSION" = "x2010"; then
-      COMMON_CXXFLAGS_JDK="$COMMON_CXXFLAGS_JDK \
+      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
           -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
     fi
   fi
--- a/common/autoconf/generated-configure.sh	Wed Jan 28 08:14:14 2015 -0800
+++ b/common/autoconf/generated-configure.sh	Thu Feb 05 14:55:30 2015 +0100
@@ -4391,7 +4391,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1422461639
+DATE_WHEN_GENERATED=1423144508
 
 ###############################################################################
 #
@@ -42468,7 +42468,7 @@
     # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
     # studio.
     if test "x$TOOLCHAIN_VERSION" = "x2010"; then
-      COMMON_CXXFLAGS_JDK="$COMMON_CXXFLAGS_JDK \
+      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
           -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
     fi
   fi