D39917.id121338.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39917.id121338.diff
View Options

	diff --git a/lib/libc/Makefile b/lib/libc/Makefile
	--- a/lib/libc/Makefile
	+++ b/lib/libc/Makefile
	@@ -6,9 +6,6 @@

	.include <src.opts.mk>

	-# Force building of libc_pic.a
	-MK_TOOLCHAIN= yes
	-
	LIBC_SRCTOP?= ${.CURDIR}

	# Pick the current architecture directory for libc. In general, this is
	diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
	--- a/share/mk/bsd.lib.mk
	+++ b/share/mk/bsd.lib.mk
	@@ -378,7 +378,7 @@
	.endif
	.endif #defined(SHLIB_NAME)

	-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
	+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
	_LIBS+= lib${LIB_PRIVATE}${LIB}_pic.a

	lib${LIB_PRIVATE}${LIB}_pic.a: ${SOBJS}
	@@ -540,7 +540,7 @@
	.endif # SHLIB_LDSCRIPT
	.endif # SHLIB_LINK
	.endif # SHIB_NAME
	-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
	+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/
	.endif