From: Tom Tromey <tromey@adacore.com>
Date: Mon, 5 Apr 2021 12:53:35 +0000 (-0600)
Subject: Adjust location of readline in sim/erc32
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53e123a5783a0b7a88baf129e6a2d2956513a768;p=binutils-gdb.git

Adjust location of readline in sim/erc32

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.
---

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 8b690b16e4f..dd8aa42c262 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-05  Tom Tromey  <tromey@adacore.com>
+
+	* configure: Rebuild.
+	* configure.ac (READLINE): Adjust in-tree value.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, configure: Regenerate.
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)