From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DF0A2385843A; Sat, 5 Nov 2022 14:23:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF0A2385843A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667658216; bh=cSaQBf0IXAA/my0JQuqQ94AYqNqH3uacem7AdgKywhY=; h=From:To:Subject:Date:From; b=F7b1pAPHLm/tuvff8z0gfMGOPNo1BQYwT08H8laYeCygbWLfG7vue3GB1tNwzMgau ze2qlEcn/AYMoNSG7fE0aP0Ixpd8r4oB8U7LWB4Gob8FgCmjOF/KzmvvBykjuuk8Us bv5WqIQ1JXwfa4HTZRBCJGIlNPKWh5Um7/jgWNCY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: fix readline linkage X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: c95bd9111ee75556a4a6ba51603856cee0afef2b X-Git-Newrev: 5a9886170b3bc9027ec72ab425fb0e3d4a1aa330 Message-Id: <20221105142336.DF0A2385843A@sourceware.org> Date: Sat, 5 Nov 2022 14:23:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5a9886170b3b= c9027ec72ab425fb0e3d4a1aa330 commit 5a9886170b3bc9027ec72ab425fb0e3d4a1aa330 Author: Mike Frysinger Date: Sat Nov 5 21:21:31 2022 +0700 sim: fix readline linkage =20 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. Diff: --- sim/configure | 2 +- sim/m4/sim_ac_platform.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/configure b/sim/configure index d8b734e59eb..0a0eb6dbf0c 100755 --- a/sim/configure +++ b/sim/configure @@ -13446,7 +13446,7 @@ fi =20 =20 if test -r ../readline/Makefile; then - READLINE_LIB=3D../../readline/readline/libreadline.a + READLINE_LIB=3D../readline/readline/libreadline.a READLINE_CFLAGS=3D'-I$(READLINE_SRC)/..' else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lread= line" >&5 diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index 467987e11e7..abfb2bd9e6e 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -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=3D../../readline/readline/libreadline.a + READLINE_LIB=3D../readline/readline/libreadline.a READLINE_CFLAGS=3D'-I$(READLINE_SRC)/..' else AC_CHECK_LIB(readline, readline, READLINE_LIB=3D-lreadline,