espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 04:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

gprofng: use the --libdir path to find libraries

Browse Source 
gprofng/ChangeLog
2022-10-10  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

	PR gprofng/29663
	* src/Makefile.am: Add -DLIBDIR to CPPFLAGS.
	* src/Makefile.in: Rebuild.
	* src/envsets.cc (putenv_libcollector_ld_misc): Use LIBDIR to find
	the gprofng libraries.
This commit is contained in:
Vladimir Mezentsev
2022-10-10 15:34:42 -07:00
parent a665c4d5c6
commit 7b68800441
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gprofng/src/Makefile.am
View File

@ -108,7 +108,7 @@ LOCALEDIR = @localedir@
SYSCONFDIR = @sysconfdir@
AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-DSYSCONFDIR=\"$(SYSCONFDIR)\" \
-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \
-I.. -I$(srcdir) \
-I$(srcdir)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \

2
gprofng/src/Makefile.in
View File

@ -536,7 +536,7 @@ ZLIBINC = @zlibinc@
LOCALEDIR = @localedir@
SYSCONFDIR = @sysconfdir@
AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-DSYSCONFDIR=\"$(SYSCONFDIR)\" \
-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \
-I.. -I$(srcdir) \
-I$(srcdir)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \

8
gprofng/src/envsets.cc
View File

@ -159,12 +159,18 @@ collect::putenv_libcollector_ld_misc ()
sb.appendf ("%s=", "SP_COLLECTOR_LIBRARY_PATH");
int len = sb.length ();
int cnt = 0;
char *fname = dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTOR);
if (access (fname, R_OK | F_OK) == 0)
{
++cnt;
sb.appendf ("%s/%s", LIBDIR, PACKAGE);
}
free (fname);
for (char *s = ev; s;)
{
char *s1 = strchr (s, ':');
if (s1)
*(s1++) = 0;
char *fname;
if (*s == '/')
{
fname = dbe_sprintf ("%s/%s/%s", s, PACKAGE, LIBGP_COLLECTOR);