Removed isa-run simulator check in configure.
This commit is contained in:
Christopher Celio
parent
a275cb8456
commit
a4a5d53a3f
|
|
@ -573,9 +573,6 @@ subprojects
|
|||
EGREP
|
||||
GREP
|
||||
CPP
|
||||
RUNFLAGS
|
||||
ac_ct_RUN
|
||||
RUN
|
||||
stow
|
||||
INSTALL_DATA
|
||||
INSTALL_SCRIPT
|
||||
|
|
@ -3265,11 +3262,9 @@ fi
|
|||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# MCPPBS specific program checks
|
||||
# MCPPBS specific program check
|
||||
#-------------------------------------------------------------------------
|
||||
# These macros check to see if we can do a stow-based install and also
|
||||
# check for an isa simulator suitable for running the unit test programs
|
||||
# via the makefile.
|
||||
# This macro check to see if we can do a stow-based install.
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
|
|
@ -3484,123 +3479,6 @@ fi
|
|||
|
||||
|
||||
|
||||
if test "${build}" != "${host}" ; then :
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
for ac_prog in isa-run run
|
||||
do
|
||||
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_RUN+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$RUN"; then
|
||||
ac_cv_prog_RUN="$RUN" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_RUN="$ac_tool_prefix$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
RUN=$ac_cv_prog_RUN
|
||||
if test -n "$RUN"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUN" >&5
|
||||
$as_echo "$RUN" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$RUN" && break
|
||||
done
|
||||
fi
|
||||
if test -z "$RUN"; then
|
||||
ac_ct_RUN=$RUN
|
||||
for ac_prog in isa-run run
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_ac_ct_RUN+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$ac_ct_RUN"; then
|
||||
ac_cv_prog_ac_ct_RUN="$ac_ct_RUN" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_RUN="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_RUN=$ac_cv_prog_ac_ct_RUN
|
||||
if test -n "$ac_ct_RUN"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RUN" >&5
|
||||
$as_echo "$ac_ct_RUN" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$ac_ct_RUN" && break
|
||||
done
|
||||
|
||||
if test "x$ac_ct_RUN" = x; then
|
||||
RUN="no"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
RUN=$ac_ct_RUN
|
||||
fi
|
||||
fi
|
||||
|
||||
if test ${RUN} = "no" ; then :
|
||||
|
||||
as_fn_error $? "Cannot find simulator for target ${target_alias}" "$LINENO" 5
|
||||
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
RUN=""
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Checks for header files
|
||||
#-------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -52,14 +52,11 @@ AC_CHECK_TOOL([AR],[ar])
|
|||
AC_CHECK_TOOL([RANLIB],[ranlib])
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# MCPPBS specific program checks
|
||||
# MCPPBS specific program check
|
||||
#-------------------------------------------------------------------------
|
||||
# These macros check to see if we can do a stow-based install and also
|
||||
# check for an isa simulator suitable for running the unit test programs
|
||||
# via the makefile.
|
||||
# This macro check to see if we can do a stow-based install.
|
||||
|
||||
MCPPBS_PROG_INSTALL
|
||||
MCPPBS_PROG_RUN
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Checks for header files
|
||||
|
|
|
|||
Loading…
Reference in New Issue