460 CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib" |
460 CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib" |
461 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
461 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
462 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
462 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
463 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
463 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
464 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
464 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
465 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ |
465 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK \ |
466 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \ |
466 -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ |
467 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ |
467 -DWIN32_LEAN_AND_MEAN \ |
468 -DWIN32 -DIAL" |
468 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ |
|
469 -DWIN32 -DIAL" |
469 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
470 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
470 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64" |
471 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64" |
471 else |
472 else |
472 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86" |
473 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86" |
|
474 fi |
|
475 # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to |
|
476 # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual |
|
477 # studio. |
|
478 if test "x$TOOLCHAIN_VERSION" = "x2010"; then |
|
479 CXXFLAGS_JDK="$CXXFLAGS_JDK \ |
|
480 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB" |
473 fi |
481 fi |
474 fi |
482 fi |
475 |
483 |
476 ############################################################################### |
484 ############################################################################### |
477 |
485 |