svn commit: r366633 - head/share/mk

Alex Richardson arichardson at FreeBSD.org
Mon Oct 12 10:42:21 UTC 2020


Author: arichardson
Date: Mon Oct 12 10:42:19 2020
New Revision: 366633
URL: https://svnweb.freebsd.org/changeset/base/366633

Log:
  Don't use install(1) for the library symlinks in the build directory
  
  It appears this was changed from ln to use install in rS245752. I noticed
  this because my buildenv was setting INSTALL=install -U -M //METALOG
  and then these links fail to be created with the following error:
  install: open //METALOG: Permission denied
  
  Reviewed By:	brooks
  Differential Revision: https://reviews.freebsd.org/D26618

Modified:
  head/share/mk/bsd.lib.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Mon Oct 12 10:42:14 2020	(r366632)
+++ head/share/mk/bsd.lib.mk	Mon Oct 12 10:42:19 2020	(r366633)
@@ -312,7 +312,8 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
 	@${ECHO} building shared library ${SHLIB_NAME}
 	@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
 .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) && ${MK_DEBUG_FILES} == "no"
-	@${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${SHLIB_LINK}
+	# Note: This uses ln instead of ${INSTALL_LIBSYMLINK} since we are in OBJDIR
+	@${LN:Uln} -fs ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
 	${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} ${SOBJS} ${LDADD}
@@ -326,7 +327,8 @@ ${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.debug
 	${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.debug \
 	    ${SHLIB_NAME_FULL} ${.TARGET}
 .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld)
-	@${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${SHLIB_LINK}
+	# Note: This uses ln instead of ${INSTALL_LIBSYMLINK} since we are in OBJDIR
+	@${LN:Uln} -fs ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
 
 ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL}


More information about the svn-src-all mailing list