sim: fix readline linkage
authorMike Frysinger <vapier@gentoo.org>
Sat, 5 Nov 2022 14:21:31 +0000 (21:21 +0700)
committerMike Frysinger <vapier@gentoo.org>
Sat, 5 Nov 2022 14:21:31 +0000 (21:21 +0700)
Now that we link programs in the top dir instead of the arch subdir,
update the readline library path to be relative to the top dir.

sim/configure
sim/m4/sim_ac_platform.m4

index d8b734e59ebd281b1da21af8869aa898ad05f8d9..0a0eb6dbf0c2465cc3ca73db28844de3573c4956 100755 (executable)
@@ -13446,7 +13446,7 @@ fi
 
 
 if test -r ../readline/Makefile; then
-  READLINE_LIB=../../readline/readline/libreadline.a
+  READLINE_LIB=../readline/readline/libreadline.a
   READLINE_CFLAGS='-I$(READLINE_SRC)/..'
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
index 467987e11e7ee1953e30c7008500f2270c4d252f..abfb2bd9e6e66a444204947dbbb6930a6356df7b 100644 (file)
@@ -190,7 +190,7 @@ AC_SUBST(TERMCAP_LIB)
 dnl We prefer the in-tree readline.  Top-level dependencies make sure
 dnl src/readline (if it's there) is configured before src/sim.
 if test -r ../readline/Makefile; then
-  READLINE_LIB=../../readline/readline/libreadline.a
+  READLINE_LIB=../readline/readline/libreadline.a
   READLINE_CFLAGS='-I$(READLINE_SRC)/..'
 else
   AC_CHECK_LIB(readline, readline, READLINE_LIB=-lreadline,