From 6fcce128fcc664a07d51b1298e989b1ce54bc1a8 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Wed, 25 Nov 2015 19:13:35 +0000 Subject: 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 --- lib/libproc/Makefile | 3 --- lib/libproc/Makefile.depend | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/libproc') diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 3feddb5..8c4f484 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -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 diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend index 1615031..33b871f 100644 --- a/lib/libproc/Makefile.depend +++ b/lib/libproc/Makefile.depend @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libelf \ + lib/librtld_db \ lib/libutil \ -- cgit v1.1