]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
toplevel: Makefile.def: Make configure-sim depend on all-readline
authorHans-Peter Nilsson <hp@axis.com>
Wed, 9 Mar 2022 19:54:37 +0000 (20:54 +0100)
committerHans-Peter Nilsson <hp@axis.com>
Wed, 9 Mar 2022 19:54:37 +0000 (20:54 +0100)
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.

Makefile.def
Makefile.in

index 80347fd13dab979235e0af7d2ed7b8e4198d4ebb..72d58549645a95256d88916cef09ebed72eb12a0 100644 (file)
@@ -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; };
index 7d97049c8d65248d03807d8c910b4fa1bf221b48..593495e16503a0e54ab66ead95071adab77cac0f 100644 (file)
@@ -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