diff options
| -rw-r--r-- | sim/ChangeLog | 6 | ||||
| -rwxr-xr-x | sim/configure | 8 | ||||
| -rw-r--r-- | sim/configure.ac | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 5316e24..5f5f5b8 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,9 @@ +2020-09-03 Jose E. Marchesi <jose.marchesi@oracle.com> + + * configure.ac: Do not configure sim/testsuite nor sim/igen if the + primary target doesn't have a simulator. + * configure: Regenerate. + 2020-08-04 Jose E. Marchesi <jose.marchesi@oracle.com> David Faust <david.faust@oracle.com> diff --git a/sim/configure b/sim/configure index 37a86f4..34f1a15 100755 --- a/sim/configure +++ b/sim/configure @@ -3914,11 +3914,13 @@ subdirs="$subdirs aarch64" esac - subdirs="$subdirs testsuite" + if test x"${sim_arch}" != x; then + subdirs="$subdirs testsuite" - if test "$sim_igen" = yes; then - subdirs="$subdirs igen" + if test "$sim_igen" = yes; then + subdirs="$subdirs igen" + fi fi fi diff --git a/sim/configure.ac b/sim/configure.ac index 896791e..d92ca25 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -43,9 +43,11 @@ m4_define([SIM_ARCH], [ ]) if test "${enable_sim}" != no; then sinclude(configure.tgt) - AC_CONFIG_SUBDIRS(testsuite) - if test "$sim_igen" = yes; then - AC_CONFIG_SUBDIRS(igen) + if test x"${sim_arch}" != x; then + AC_CONFIG_SUBDIRS(testsuite) + if test "$sim_igen" = yes; then + AC_CONFIG_SUBDIRS(igen) + fi fi fi |