D5637.id14345.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D5637.id14345.diff
View Options

	Index: head/share/mk/bsd.lib.mk
	===================================================================
	--- head/share/mk/bsd.lib.mk
	+++ head/share/mk/bsd.lib.mk
	@@ -235,7 +235,6 @@
	${SHLIB_LINK:R}.ld: ${.CURDIR}/${SHLIB_LDSCRIPT}
	sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
	-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
	- -e 's,/[^ ]*/,,g' \
	${.ALLSRC} > ${.TARGET}

	${SHLIB_NAME_FULL}: ${SHLIB_LINK:R}.ld
	@@ -339,6 +338,9 @@
	.if !defined(INTERNALLIB)
	realinstall: _libinstall
	.ORDER: beforeinstall _libinstall
	+.if target(${SHLIB_LINK:R}.ld)
	+_libinstall: ${SHLIB_LINK:R}.ld
	+.endif
	_libinstall:
	.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	@@ -365,6 +367,7 @@
	${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \
	${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
	+ rm -f ${SHLIB_LINK:R}.ld
	.for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS}
	${INSTALL_SYMLINK} ${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${_SHLIB_LINK_LINK}
	.endfor
	Index: head/share/mk/bsd.sys.mk
	===================================================================
	--- head/share/mk/bsd.sys.mk
	+++ head/share/mk/bsd.sys.mk
	@@ -231,7 +231,7 @@
	.endif

	.if defined(SHLIB_LINK) && commands(${SHLIB_LINK:R}.ld)
	-_LDSCRIPTROOT?= ${STAGE_OBJTOP}
	+#_LDSCRIPTROOT?= ${STAGE_OBJTOP}
	STAGE_AS_SETS+= ldscript
	STAGE_AS.ldscript+= ${SHLIB_LINK:R}.ld
	stage_as.ldscript: ${SHLIB_LINK:R}.ld