From: Hans-Peter Nilsson <hp@axis.com>
Date: Wed, 9 Mar 2022 19:54:37 +0000 (+0100)
Subject: toplevel: Makefile.def: Make configure-sim depend on all-readline
X-Git-Tag: basepoints/gcc-13~745
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2607d71e5e371c0c006555e0531ea1ff5ac416c;p=thirdparty%2Fgcc.git

toplevel: Makefile.def: Make configure-sim depend on all-readline

Without this, a "make all-sim" without the equivalent of
libreadline-dev installed on the build system, won't
properly pick up the in-tree readline build, and you'll see:

mkdir -p -- ./sim
Configuring in ./sim
configure: creating cache ./config.cache
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking target system type... cris-axis-elf
checking for x86_64-pc-linux-gnu-gcc... gcc
checking whether the C compiler works... yes
...
checking for library containing tgetent... -ltermcap
checking for readline in -lreadline... no
configure: error: the required "readline" library is missing
make[1]: *** [Makefile:11188: configure-sim] Error 1
make[1]: Leaving directory '/home/hp/sim/b'

The sim dependency on readline is apparently (nominally)
valid as there's a readline call in sim/erc32/sis.c.

2022-02-21  Hans-Peter Nilsson  <hp@axis.com>

	* Makefile.def (dependencies): Make configure-sim depend on
	all-readline.
	* Makefile.in: Regenerate.
---

diff --git a/Makefile.def b/Makefile.def
index 80347fd13dab..72d58549645a 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -570,7 +570,7 @@ dependencies = { module=all-sim; on=all-intl; };
 dependencies = { module=all-sim; on=all-libiberty; };
 dependencies = { module=all-sim; on=all-bfd; };
 dependencies = { module=all-sim; on=all-opcodes; };
-dependencies = { module=all-sim; on=all-readline; };
+dependencies = { module=configure-sim; on=all-readline; };
 
 // Other host modules.
 dependencies = { module=all-fastjar; on=all-zlib; };
diff --git a/Makefile.in b/Makefile.in
index 7d97049c8d65..593495e16503 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66260,7 +66260,7 @@ install-strip-sid: maybe-install-strip-tcl
 install-sid: maybe-install-tk
 install-strip-sid: maybe-install-strip-tk
 configure-sim: maybe-all-gnulib
-all-sim: maybe-all-readline
+configure-sim: maybe-all-readline
 all-fastjar: maybe-all-build-texinfo
 all-libctf: all-libiberty
 all-stage1-libctf: all-stage1-libiberty