From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2041) id 7CCBC3858C2D; Tue, 11 Oct 2022 07:18:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CCBC3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665472693; bh=yZmy0ix5p2+fHDExekXDZpPRaXrfJpevomJ8ORvJvHE=; h=From:To:Subject:Date:From; b=xbCCrCw/ma2ICwlQjDbGOzq+9REpqKmShN3BpW+UfksaQ45hMOqVSKbHfdMVnKa4+ V1HYe+1pVt7FPoPYi+D1v52KxfXnMnSs1KbyOl9KqXSdHhMrelter1vTr5NBKgX2Em 5ySEslFtK5dPp6fcv1d4rhGy22HPTojyndmn7aEE= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Vladimir Mezentsev To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] gprofng: use the --libdir path to find libraries X-Act-Checkin: binutils-gdb X-Git-Author: Vladimir Mezentsev X-Git-Refname: refs/heads/master X-Git-Oldrev: a665c4d5c6e1d23d31ac434949b9243025496aef X-Git-Newrev: 7b68800441a1572640b34f988c8f71f50b2a70cf Message-Id: <20221011071813.7CCBC3858C2D@sourceware.org> Date: Tue, 11 Oct 2022 07:18:13 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7b68800441a1= 572640b34f988c8f71f50b2a70cf commit 7b68800441a1572640b34f988c8f71f50b2a70cf Author: Vladimir Mezentsev Date: Mon Oct 10 15:34:42 2022 -0700 gprofng: use the --libdir path to find libraries =20 gprofng/ChangeLog 2022-10-10 Vladimir Mezentsev =20 PR gprofng/29663 * src/Makefile.am: Add -DLIBDIR to CPPFLAGS. * src/Makefile.in: Rebuild. * src/envsets.cc (putenv_libcollector_ld_misc): Use LIBDIR to f= ind the gprofng libraries. Diff: --- gprofng/src/Makefile.am | 2 +- gprofng/src/Makefile.in | 2 +- gprofng/src/envsets.cc | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 6e0931524e4..27ef7974afe 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -108,7 +108,7 @@ LOCALEDIR =3D @localedir@ SYSCONFDIR =3D @sysconfdir@ =20 AM_CPPFLAGS =3D $(GPROFNG_CPPFLAGS) -DLOCALEDIR=3D\"$(LOCALEDIR)\" \ - -DSYSCONFDIR=3D\"$(SYSCONFDIR)\" \ + -DSYSCONFDIR=3D\"$(SYSCONFDIR)\" -DLIBDIR=3D\"$(libdir)\" \ -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index ba7fdd6e8ad..7efdb9885f6 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -536,7 +536,7 @@ ZLIBINC =3D @zlibinc@ LOCALEDIR =3D @localedir@ SYSCONFDIR =3D @sysconfdir@ AM_CPPFLAGS =3D $(GPROFNG_CPPFLAGS) -DLOCALEDIR=3D\"$(LOCALEDIR)\" \ - -DSYSCONFDIR=3D\"$(SYSCONFDIR)\" \ + -DSYSCONFDIR=3D\"$(SYSCONFDIR)\" -DLIBDIR=3D\"$(libdir)\" \ -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ diff --git a/gprofng/src/envsets.cc b/gprofng/src/envsets.cc index 484cbf83995..c9838416638 100644 --- a/gprofng/src/envsets.cc +++ b/gprofng/src/envsets.cc @@ -159,12 +159,18 @@ collect::putenv_libcollector_ld_misc () sb.appendf ("%s=3D", "SP_COLLECTOR_LIBRARY_PATH"); int len =3D sb.length (); int cnt =3D 0; + char *fname =3D dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTO= R); + if (access (fname, R_OK | F_OK) =3D=3D 0) + { + ++cnt; + sb.appendf ("%s/%s", LIBDIR, PACKAGE); + } + free (fname); for (char *s =3D ev; s;) { char *s1 =3D strchr (s, ':'); if (s1) *(s1++) =3D 0; - char *fname; if (*s =3D=3D '/') { fname =3D dbe_sprintf ("%s/%s/%s", s, PACKAGE, LIBGP_COLLECTOR);