Author: bdrewery
Date: Fri Sep 18 22:28:13 2015
New Revision: 287975
URL: https://svnweb.freebsd.org/changeset/base/287975
Log:
Garbage collect _SHLIBDIRPREFIX leftovers from r284898.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.lib.mk
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Fri Sep 18 22:26:25 2015 (r287974)
+++ head/share/mk/bsd.lib.mk Fri Sep 18 22:28:13 2015 (r287975)
@@ -214,9 +214,8 @@ ${SHLIB_NAME_FULL}: beforelinking
.endif
.if defined(SHLIB_LINK)
-# ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building
-# and when building 32 bits library shims. ${_SHLIBDIRPREFIX} is the directory
-# prefix where shared objects will be installed by the install target.
+# ${_LDSCRIPTROOT} is needed when cross-building
+# and when building 32 bits library shims.
#
# ${_LDSCRIPTROOT} is the directory prefix that will be used when generating
# ld(1) scripts. The crosstools' ld is configured to lookup libraries in an
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Fri Sep 18 22:26:25 2015 (r287974)
+++ head/share/mk/bsd.sys.mk Fri Sep 18 22:28:13 2015 (r287975)
@@ -186,7 +186,6 @@ staging stage_libs stage_files stage_as
.else
# allow targets like beforeinstall to be leveraged
DESTDIR= ${STAGE_OBJTOP}
-_SHLIBDIRPREFIX= ${STAGE_OBJTOP}
.if commands(beforeinstall)
.if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
