svn commit: r302325 - head/libexec/rtld-elf

Bryan Drewery bdrewery at FreeBSD.org
Sun Jul 3 17:28:41 UTC 2016


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>


More information about the svn-src-head mailing list