Mercurial > hg > openjdk > jdk9
changeset 2442:816a6d03a7c4 jdk-9+153
8162750: -D__solaris__ added twice
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Mon, 16 Jan 2017 13:53:14 +0100 |
| parents | 5256cc3b35c8 |
| children | 8d22611ffb65 33f8f04ab876 |
| files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Mon Jan 16 13:50:59 2017 +0100 +++ b/common/autoconf/flags.m4 Mon Jan 16 13:53:14 2017 +0100 @@ -815,11 +815,6 @@ $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__" fi - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - $2CFLAGS_JDK="${$2CFLAGS_JDK} -D__solaris__" - $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__" - fi - $2CFLAGS_JDK="${$2CFLAGS_JDK} ${$2EXTRA_CFLAGS}" $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2EXTRA_CXXFLAGS}" $2LDFLAGS_JDK="${$2LDFLAGS_JDK} ${$2EXTRA_LDFLAGS}"
--- a/common/autoconf/generated-configure.sh Mon Jan 16 13:50:59 2017 +0100 +++ b/common/autoconf/generated-configure.sh Mon Jan 16 13:53:14 2017 +0100 @@ -5180,7 +5180,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1484228046 +DATE_WHEN_GENERATED=1484571183 ############################################################################### # @@ -49945,11 +49945,6 @@ CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" fi - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" - fi - CFLAGS_JDK="${CFLAGS_JDK} ${EXTRA_CFLAGS}" CXXFLAGS_JDK="${CXXFLAGS_JDK} ${EXTRA_CXXFLAGS}" LDFLAGS_JDK="${LDFLAGS_JDK} ${EXTRA_LDFLAGS}" @@ -50768,11 +50763,6 @@ OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} -D__solaris__" fi - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -D__solaris__" - OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} -D__solaris__" - fi - OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} ${OPENJDK_BUILD_EXTRA_CFLAGS}" OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} ${OPENJDK_BUILD_EXTRA_CXXFLAGS}" OPENJDK_BUILD_LDFLAGS_JDK="${OPENJDK_BUILD_LDFLAGS_JDK} ${OPENJDK_BUILD_EXTRA_LDFLAGS}"