1.1 --- a/common/autoconf/flags.m4 Fri May 04 11:00:26 2018 +0100
1.2 +++ b/common/autoconf/flags.m4 Wed May 16 15:52:51 2018 -0700
1.3 @@ -462,15 +462,23 @@
1.4 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.5 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.6 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.7 - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.8 - -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.9 - -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.10 - -DWIN32 -DIAL"
1.11 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK \
1.12 + -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.13 + -DWIN32_LEAN_AND_MEAN \
1.14 + -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.15 + -DWIN32 -DIAL"
1.16 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.17 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.18 else
1.19 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
1.20 fi
1.21 + # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to
1.22 + # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
1.23 + # studio.
1.24 + if test "x$TOOLCHAIN_VERSION" = "x2010"; then
1.25 + CXXFLAGS_JDK="$CXXFLAGS_JDK \
1.26 + -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
1.27 + fi
1.28 fi
1.29
1.30 ###############################################################################
