From owner-svn-src-head@FreeBSD.ORG  Mon Dec 15 14:25:43 2014
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 87FA7517;
 Mon, 15 Dec 2014 14:25:43 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 73ACE347;
 Mon, 15 Dec 2014 14:25:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFEPhP0009027;
 Mon, 15 Dec 2014 14:25:43 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFEPhhs009026;
 Mon, 15 Dec 2014 14:25:43 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201412151425.sBFEPhhs009026@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 15 Dec 2014 14:25:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275804 - head/gnu/usr.bin/cc/cc1plus
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.18-1
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: Mon, 15 Dec 2014 14:25:43 -0000

Author: emaste
Date: Mon Dec 15 14:25:42 2014
New Revision: 275804
URL: https://svnweb.freebsd.org/changeset/base/275804

Log:
  Remove empty generated file upon gperf failure
  
  Prior to this change the build could fail as follows, if gperf is not
  available (or fails):
  
    - make(1) stops due to the gperf error, but an empty target file
      (cfns.h) is still created
    - the empty cfns.h is newer than the source cfns.gperf so it is not
      regenerated on subsequent builds
    - the gcc build fails (undefined reference to libc_name_p)
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	3 days

Modified:
  head/gnu/usr.bin/cc/cc1plus/Makefile

Modified: head/gnu/usr.bin/cc/cc1plus/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc1plus/Makefile	Mon Dec 15 12:16:09 2014	(r275803)
+++ head/gnu/usr.bin/cc/cc1plus/Makefile	Mon Dec 15 14:25:42 2014	(r275804)
@@ -30,7 +30,7 @@ LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECN
 # C++ parser
 cfns.h: cfns.gperf
 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-	    ${.ALLSRC} > ${.TARGET}
+	    ${.ALLSRC} > ${.TARGET} || (rm -f ${.TARGET}; false)
 CLEANFILES= cfns.h
 
 DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}