8081676: Verify that configure detects AS on Solaris and print help otherwise

Reviewed-by: dholmes, erikj
This commit is contained in:
Tim Bell 2016-06-27 08:04:48 -07:00
parent 4d314b899c
commit aa7539d3df
2 changed files with 7 additions and 3 deletions

View File

@ -5094,7 +5094,7 @@ VS_SDK_PLATFORM_NAME_2013=
#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 @@ $as_echo "yes" >&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 @@ $as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
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"

View File

@ -597,9 +597,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
# 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"