Mercurial > hg > openjdk > jdk9
changeset 2124:9aa7d40f3a45 jdk-9+125
8081676: Verify that configure detects AS on Solaris and print help otherwise
Reviewed-by: dholmes, erikj
| author | tbell |
|---|---|
| date | Mon, 27 Jun 2016 08:04:48 -0700 |
| parents | be171455b90f |
| children | 67accb1b5635 31261e7238af e4be21cd0900 |
| files | common/autoconf/generated-configure.sh common/autoconf/toolchain.m4 |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Jun 23 21:12:39 2016 +0000 +++ b/common/autoconf/generated-configure.sh Mon Jun 27 08:04:48 2016 -0700 @@ -5094,7 +5094,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1466007828 +DATE_WHEN_GENERATED=1467039751 ############################################################################### # @@ -36621,7 +36621,6 @@ # Setup the assembler (AS) # if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # FIXME: should this really be solaris, or solstudio? # Publish this variable in the help. @@ -37105,6 +37104,9 @@ fi fi + if test "x$AS" = x; then + as_fn_error $? "Solaris assembler (as) is required. Please install via \"pkg install pkg:/developer/assembler\"." "$LINENO" 5 + fi else # FIXME: is this correct for microsoft? AS="$CC -c"
--- a/common/autoconf/toolchain.m4 Thu Jun 23 21:12:39 2016 +0000 +++ b/common/autoconf/toolchain.m4 Mon Jun 27 08:04:48 2016 -0700 @@ -597,9 +597,11 @@ # Setup the assembler (AS) # if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # FIXME: should this really be solaris, or solstudio? BASIC_PATH_PROGS(AS, as) BASIC_FIXUP_EXECUTABLE(AS) + if test "x$AS" = x; then + AC_MSG_ERROR([Solaris assembler (as) is required. Please install via "pkg install pkg:/developer/assembler".]) + fi else # FIXME: is this correct for microsoft? AS="$CC -c"