From owner-svn-src-head@freebsd.org  Fri Nov 13 01:47:57 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCEF1A2D65E;
 Fri, 13 Nov 2015 01:47:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 841451ED7;
 Fri, 13 Nov 2015 01:47:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAD1lu7B076014;
 Fri, 13 Nov 2015 01:47:56 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAD1luMo076013;
 Fri, 13 Nov 2015 01:47:56 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511130147.tAD1luMo076013@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 13 Nov 2015 01:47:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290740 - 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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Nov 2015 01:47:57 -0000

Author: bdrewery
Date: Fri Nov 13 01:47:56 2015
New Revision: 290740
URL: https://svnweb.freebsd.org/changeset/base/290740

Log:
  META MODE: Don't double stage SYMLINKS for libraries.
  
  meta.stage.mk is handling ${SYMLINKS:T} for stage_libs already.  The logic in
  bsd.sys.mk to handle ${SYMLINKS} was brought in r247817 when it was moved out
  of bsd.prog.mk and bsd.lib.mk into bsd.sys.mk.  The logic previously was
  limited to bsd.prog.mk.
  
  This fixes a race, seen easily in lib/libthr, where libpthread_p.a is created
  by both stage_libs and stage_symlinks resulting in 'ln: File exists'.
  
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Fri Nov 13 01:37:08 2015	(r290739)
+++ head/share/mk/bsd.sys.mk	Fri Nov 13 01:47:56 2015	(r290740)
@@ -276,7 +276,8 @@ STAGE_SETS+= links
 STAGE_LINKS.links= ${LINKS}
 .endif
 
-.if !empty(SYMLINKS)
+# Don't handle SYMLINKS for libraries since stage_libs is already doing so.
+.if !empty(SYMLINKS) && empty(_LIBS)
 STAGE_TARGETS+= stage_symlinks
 STAGE_SETS+= links
 STAGE_SYMLINKS.links= ${SYMLINKS}