From ee695f67a6efc46af7ee0edb5882abfd2f2feda9 Mon Sep 17 00:00:00 2001
From: Julio Merino <jmmv@FreeBSD.org>
Date: Fri, 8 Nov 2013 14:22:16 +0000
Subject: [PATCH] Add libatf-c++ to the prebuild libs.

Some tests may require C++ so we must ensure this library exists as part
of the bootstrap process or else they will fail to build.  Do this by
just depending on lib/atf as part of the bootstrap libraries instead of
using lib/atf/libatf-c.

Submitted by:	Garrett Cooper <yaneurabeya at gmail dot com>
Approved by:	rpaulo (mentor)
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f9a49b5ba786..5d1086282943 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1478,7 +1478,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
@@ -1493,7 +1493,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_ATF} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"