common/autoconf/flags.m4

*** 556,574 ****
      CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
      CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
      CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
!     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
!     -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
      -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
      -DWIN32 -DIAL"
      if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
      else
        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
      fi
    fi
  
    ###############################################################################
  
    # Adjust flags according to debug level.
--- 556,582 ----
      CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
      CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
      CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
!     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK \
!         -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
!         -DWIN32_LEAN_AND_MEAN \
          -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
          -DWIN32 -DIAL"
      if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
      else
        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
      fi
+     # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to
+     # 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 \
+           -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
+     fi
    fi
  
    ###############################################################################
  
    # Adjust flags according to debug level.