[pushed] Adjust location of readline in sim/erc32

Message ID 20210405125448.4131184-1-tromey@adacore.com
State New
Headers show
Series
  • [pushed] Adjust location of readline in sim/erc32
Related show

Commit Message

Tom Tromey April 5, 2021, 12:54 p.m.
sim/erc32 uses an obsolete path to the in-tree build of readline.
readline was moved into a subdirectory some time ago.  This patch
fixes the problem.  Tested by rebuilding.

sim/erc32/ChangeLog
2021-04-05  Tom Tromey  <tromey@adacore.com>

	* configure: Rebuild.
	* configure.ac (READLINE): Adjust in-tree value.
---
 sim/erc32/ChangeLog    | 5 +++++
 sim/erc32/configure    | 2 +-
 sim/erc32/configure.ac | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.26.2

Patch

diff --git a/sim/erc32/configure b/sim/erc32/configure
index ec3a2c7873f..3f7227b2e7e 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -12070,7 +12070,7 @@  fi
 # We prefer the in-tree readline.  Top-level dependencies make sure
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
-  READLINE=../../readline/libreadline.a
+  READLINE=../../readline/readline/libreadline.a
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 0edd6e3e67f..8b7b688322f 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -38,7 +38,7 @@  AC_SUBST(TERMCAP)
 # We prefer the in-tree readline.  Top-level dependencies make sure
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
-  READLINE=../../readline/libreadline.a
+  READLINE=../../readline/readline/libreadline.a
 else
   AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
 	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)