OpenJDK / jdk / hs
changeset 46937:0cc133bf6722
Merge
| author | jwilhelm |
|---|---|
| date | Tue, 29 Aug 2017 17:17:57 +0200 |
| parents | aff9d4e61eee b440e4b33965 |
| children | a8488a8b37fb |
| files | common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Mon Aug 28 21:46:12 2017 +0200 +++ b/common/autoconf/flags.m4 Tue Aug 29 17:17:57 2017 +0200 @@ -1358,7 +1358,7 @@ $2SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi $2JVM_LIBS="[$]$2JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_$1_OS" = xmacosx; then $2JVM_LIBS="[$]$2JVM_LIBS -lm" elif test "x$OPENJDK_$1_OS" = xaix; then
--- a/common/autoconf/generated-configure.sh Mon Aug 28 21:46:12 2017 +0200 +++ b/common/autoconf/generated-configure.sh Tue Aug 29 17:17:57 2017 +0200 @@ -5151,7 +5151,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1503949566 +DATE_WHEN_GENERATED=1504019871 ############################################################################### # @@ -52064,7 +52064,7 @@ SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi JVM_LIBS="$JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_TARGET_OS" = xmacosx; then JVM_LIBS="$JVM_LIBS -lm" elif test "x$OPENJDK_TARGET_OS" = xaix; then @@ -52943,7 +52943,7 @@ OPENJDK_BUILD_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_BUILD_OS" = xmacosx; then OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm" elif test "x$OPENJDK_BUILD_OS" = xaix; then