From 5731a3ce7dd4a578324c722f7817d9d53a6279c2 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Wed, 20 May 2015 12:56:40 +0000
Subject: [PATCH] Add _more_ missing dependencies for lib/libproc to further
 squash build races

Verified via `cd lib/libproc; make -VLIBADD`

Pointyhat to: ngie
---
 Makefile.inc1 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index ace14167c452..863644eb64a8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1746,7 +1746,15 @@ _generic_libs+= ${_DIR}
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
-lib/libproc__L: lib/libelf__L lib/librtld_db__L lib/libutil__L
+lib/libproc__L: \
+    cddl/lib/libctf__L lib/libelf__L lib/librtld_db__L lib/libutil__L
+.if ${MK_CXX} != "no"
+.if ${MK_LIBCPLUSPLUS} != "no"
+lib/libproc__L: lib/libc++
+.else
+lib/libproc__L: gnu/lib/libsupc++__L
+.endif
+.endif
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem