From owner-svn-src-head@freebsd.org  Sun Jul  3 17:28:41 2016
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 26143B90323;
 Sun,  3 Jul 2016 17:28:41 +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 EC0872EB1;
 Sun,  3 Jul 2016 17:28:40 +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 u63HSedY056369;
 Sun, 3 Jul 2016 17:28:40 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u63HSeME056368;
 Sun, 3 Jul 2016 17:28:40 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201607031728.u63HSeME056368@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: Sun, 3 Jul 2016 17:28:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302325 - head/libexec/rtld-elf
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.22
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: Sun, 03 Jul 2016 17:28:41 -0000

Author: bdrewery
Date: Sun Jul  3 17:28:39 2016
New Revision: 302325
URL: https://svnweb.freebsd.org/changeset/base/302325

Log:
  Fix race for incrementally rebuilding VERSION_MAP.
  
  The dependency is needed in PROG_FULL since only the build of PROG_FULL
  is using the LDFLAGS and depending on VERSION_MAP.  This was not a problem
  with MK_DEBUG_FILES==no since it only builds PROG.
  
  This should probably be using bsd.lib.mk instead [1]
  
  Reported by:	swills, gjb
  Reviewed by:	emaste
  Noted by:	rgrimes [1]
  Sponsored by:	EMC / Isilon Storage Division
  Approved by:	re (kib)

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Sun Jul  3 15:00:12 2016	(r302324)
+++ head/libexec/rtld-elf/Makefile	Sun Jul  3 17:28:39 2016	(r302325)
@@ -69,8 +69,6 @@ SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 VERSION_MAP=	Version.map
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 
-${PROG}:	${VERSION_MAP}
-
 .if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map)
 SYMBOL_MAPS+=	${.CURDIR}/${RTLD_ARCH}/Symbol.map
 .endif
@@ -92,4 +90,5 @@ SUBDIR+=	tests
 .endif
 
 .include <bsd.prog.mk>
+${PROG_FULL}:	${VERSION_MAP}
 .include <bsd.symver.mk>