d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

META MODE: Rework circular dependency guard for librtld_db/libproc.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-11-25 19:13:35 +00:00
parent bb8cd0c6f0
commit db548a6148
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libproc/Makefile
View File

@ -14,9 +14,6 @@ SRCS= proc_bkpt.c \
INCS= libproc.h INCS= libproc.h
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
# avoid cyclic dependency
CFLAGS+= -I${.CURDIR:H}/librtld_db
GENDIRDEPS_FILTER+= Nlib/librtld_db
.if ${MK_CXX} == "no" .if ${MK_CXX} == "no"
CFLAGS+= -DNO_CXA_DEMANGLE CFLAGS+= -DNO_CXA_DEMANGLE

1
lib/libproc/Makefile.depend
View File

@ -12,6 +12,7 @@ DIRDEPS = \
lib/libcompiler_rt \ lib/libcompiler_rt \
lib/libcxxrt \ lib/libcxxrt \
lib/libelf \ lib/libelf \
lib/librtld_db \
lib/libutil \ lib/libutil \

2
lib/librtld_db/Makefile
View File

@ -10,5 +10,7 @@ SRCS= rtld_db.c
INCS= rtld_db.h INCS= rtld_db.h
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
# Avoid circular dependency, we only need the libproc.h header here.
CFLAGS+= -I${.CURDIR:H}/libproc
.include <bsd.lib.mk> .include <bsd.lib.mk>

1
lib/librtld_db/Makefile.depend
View File

@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \ lib/libc \
lib/libcompiler_rt \ lib/libcompiler_rt \
lib/libelf \ lib/libelf \
lib/libproc \
lib/libutil \ lib/libutil \