Date: Wed, 25 Nov 2015 19:13:36 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291313 - in head/lib: libproc librtld_db Message-ID: <201511251913.tAPJDaS0094748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Nov 25 19:13:35 2015 New Revision: 291313 URL: https://svnweb.freebsd.org/changeset/base/291313 Log: META MODE: Rework circular dependency guard for librtld_db/libproc. librtld_db only needs libutil.h to build, not the libproc library. So it can safely use its header and allow libproc to depend on librtld_rb to be built first to link. This is required after fixing ld --sysroot in r291226. Sponsored by: EMC / Isilon Storage Division Modified: head/lib/libproc/Makefile head/lib/libproc/Makefile.depend head/lib/librtld_db/Makefile head/lib/librtld_db/Makefile.depend Modified: head/lib/libproc/Makefile ============================================================================== --- head/lib/libproc/Makefile Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/libproc/Makefile Wed Nov 25 19:13:35 2015 (r291313) @@ -14,9 +14,6 @@ SRCS= proc_bkpt.c \ INCS= libproc.h CFLAGS+= -I${.CURDIR} -# avoid cyclic dependency -CFLAGS+= -I${.CURDIR:H}/librtld_db -GENDIRDEPS_FILTER+= Nlib/librtld_db .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE Modified: head/lib/libproc/Makefile.depend ============================================================================== --- head/lib/libproc/Makefile.depend Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/libproc/Makefile.depend Wed Nov 25 19:13:35 2015 (r291313) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libelf \ + lib/librtld_db \ lib/libutil \ Modified: head/lib/librtld_db/Makefile ============================================================================== --- head/lib/librtld_db/Makefile Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/librtld_db/Makefile Wed Nov 25 19:13:35 2015 (r291313) @@ -10,5 +10,7 @@ SRCS= rtld_db.c INCS= rtld_db.h CFLAGS+= -I${.CURDIR} +# Avoid circular dependency, we only need the libproc.h header here. +CFLAGS+= -I${.CURDIR:H}/libproc .include <bsd.lib.mk> Modified: head/lib/librtld_db/Makefile.depend ============================================================================== --- head/lib/librtld_db/Makefile.depend Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/librtld_db/Makefile.depend Wed Nov 25 19:13:35 2015 (r291313) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libelf \ - lib/libproc \ lib/libutil \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511251913.tAPJDaS0094748>