diff options
| -rw-r--r-- | lib/libproc/Makefile | 3 | ||||
| -rw-r--r-- | lib/libproc/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/librtld_db/Makefile | 2 | ||||
| -rw-r--r-- | lib/librtld_db/Makefile.depend | 1 |
4 files changed, 3 insertions, 4 deletions
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 \ diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile index 2815a07..9f9b603 100644 --- a/lib/librtld_db/Makefile +++ b/lib/librtld_db/Makefile @@ -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> diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend index 4a7dcd9..90c66d4 100644 --- a/lib/librtld_db/Makefile.depend +++ b/lib/librtld_db/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libelf \ - lib/libproc \ lib/libutil \ |
