From owner-svn-src-head@FreeBSD.ORG  Tue Jul  1 18:26:30 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BAE8A600;
 Tue,  1 Jul 2014 18:26:30 +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 A8EC82F6F;
 Tue,  1 Jul 2014 18:26:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61IQUHZ022446;
 Tue, 1 Jul 2014 18:26:30 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61IQUaf022445;
 Tue, 1 Jul 2014 18:26:30 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201407011826.s61IQUaf022445@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 1 Jul 2014 18:26:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268110 - head/share/mk
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
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: Tue, 01 Jul 2014 18:26:30 -0000

Author: gjb
Date: Tue Jul  1 18:26:30 2014
New Revision: 268110
URL: http://svnweb.freebsd.org/changeset/base/268110

Log:
  Merge r267837 from ^/projects/release-debugdist:
    When building world when WITH_DEBUG_FILES is set,
    avoid building ar(1) archives with '-g'.
  
  Tested on:	head@r267801
  Reviewed by:	emaste, imp
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/bsd.lib.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Tue Jul  1 18:24:54 2014	(r268109)
+++ head/share/mk/bsd.lib.mk	Tue Jul  1 18:26:30 2014	(r268110)
@@ -45,7 +45,8 @@ STRIP?=	-s
 
 .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
     empty(DEBUG_FLAGS:M-gdwarf*)
-CFLAGS+= -g
+SHARED_CFLAGS+= -g
+SHARED_CXXFLAGS+= -g
 CTFFLAGS+= -g
 .endif