From 7dc7323c0bcdf059622ac05aa8ac9629cca2aa8d Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Wed, 9 Mar 2022 20:46:16 +0100 Subject: [PATCH] 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 * Makefile.def (dependencies): Make configure-sim depend on all-readline. --- Makefile.def | 2 +- Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def index a504192e6d7..8181a7aa97b 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 2b77a470694..843e150dac6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63072,7 +63072,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 -- 2.30.2