Browse Source

Remove vestigial configure search for riscv-isa-run/spike

pull/27/head
Andrew Waterman 10 years ago
parent
commit
dadad2d984
  1. 28
      aclocal.m4
  2. 121
      configure
  3. 1
      configure.ac

28
aclocal.m4

@ -104,34 +104,6 @@ AC_DEFUN([MCPPBS_PROG_INSTALL],
])
#-------------------------------------------------------------------------
# MCPPBS_PROG_RUN
# -------------------------------------------------------------------------
# If we are doing a non-native build then we look for an isa simulator
# to use for running tests. We set the RUN substitution variable to be
# empty for native builds or to the name of the isa simulator for
# non-native builds. Thus a makefile can run compiled programs
# regardless if we are doing a native or non-native build like this:
#
# $(RUN) $(RUNFLAGS) ./test-program
#
AC_DEFUN([MCPPBS_PROG_RUN],
[
AS_IF([ test "${build}" != "${host}" ],
[
AC_CHECK_TOOLS([RUN],[spike],[no])
AS_IF([ test ${RUN} = "no" ],
[
AC_MSG_ERROR([Cannot find simulator for target ${target_alias}])
])
],[
RUN=""
])
AC_SUBST([RUN])
AC_SUBST([RUNFLAGS])
])
#-------------------------------------------------------------------------
# MCPPBS_SUBPROJECTS([ sproj1, sproj2, ... ])
#-------------------------------------------------------------------------

121
configure

@ -594,9 +594,6 @@ BBL_PAYLOAD
EGREP
GREP
CPP
RUNFLAGS
ac_ct_RUN
RUN
stow
INSTALL_DATA
INSTALL_SCRIPT
@ -3467,123 +3464,7 @@ fi
fi
if test "${build}" != "${host}" ; then :
if test -n "$ac_tool_prefix"; then
for ac_prog in spike
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 as_fn_executable_p "$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 spike
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 as_fn_executable_p "$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
MCPPBS_PROG_RUN
#-------------------------------------------------------------------------
# Checks for header files

1
configure.ac

@ -59,7 +59,6 @@ AC_CHECK_TOOL([RANLIB],[ranlib])
# via the makefile.
MCPPBS_PROG_INSTALL
MCPPBS_PROG_RUN
#-------------------------------------------------------------------------
# Checks for header files

Loading…
Cancel
Save