From owner-svn-src-head@FreeBSD.ORG  Fri Nov  8 14:22:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 01D86D03;
 Fri,  8 Nov 2013 14:22:17 +0000 (UTC)
 (envelope-from jmmv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E409C2C67;
 Fri,  8 Nov 2013 14:22:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA8EMGVa013778;
 Fri, 8 Nov 2013 14:22:16 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA8EMGPZ013777;
 Fri, 8 Nov 2013 14:22:16 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201311081422.rA8EMGPZ013777@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Fri, 8 Nov 2013 14:22:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257849 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Nov 2013 14:22:17 -0000

Author: jmmv
Date: Fri Nov  8 14:22:16 2013
New Revision: 257849
URL: http://svnweb.freebsd.org/changeset/base/257849

Log:
  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)

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Nov  8 14:20:22 2013	(r257848)
+++ head/Makefile.inc1	Fri Nov  8 14:22:16 2013	(r257849)
@@ -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"