d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race for incrementally rebuilding VERSION_MAP.

Browse Source 
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)
This commit is contained in:
Bryan Drewery 2016-07-03 17:28:39 +00:00
parent a8bacd6f93
commit e7debdcb15
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libexec/rtld-elf/Makefile
View File

@ -69,8 +69,6 @@ SYMBOL_MAPS= ${.CURDIR}/Symbol.map
VERSION_MAP= Version.map VERSION_MAP= Version.map
LDFLAGS+= -Wl,--version-script=${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
${PROG}: ${VERSION_MAP}
.if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map) .if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map)
SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map
.endif .endif
@ -92,4 +90,5 @@ SUBDIR+= tests
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>
${PROG_FULL}: ${VERSION_MAP}
.include <bsd.symver.mk> .include <bsd.symver.mk>