aboutsummaryrefslogtreecommitdiff
path: root/sim/erc32
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2021-04-05 06:53:35 -0600
committerTom Tromey <tromey@adacore.com>2021-04-05 06:53:35 -0600
commit53e123a5783a0b7a88baf129e6a2d2956513a768 (patch)
tree897be399a934b96401b27c50be10197423f6653d /sim/erc32
parentc774eab1c82f49f0f719fd7e51e5988c62082118 (diff)
downloadgdb-53e123a5783a0b7a88baf129e6a2d2956513a768.zip
gdb-53e123a5783a0b7a88baf129e6a2d2956513a768.tar.gz
gdb-53e123a5783a0b7a88baf129e6a2d2956513a768.tar.bz2
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.
Diffstat (limited to 'sim/erc32')
-rw-r--r--sim/erc32/ChangeLog5
-rwxr-xr-xsim/erc32/configure2
-rw-r--r--sim/erc32/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 8b690b1..dd8aa42 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 ec3a2c7..3f7227b 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 0edd6e3..8b7b688 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)