]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Garbage collect _SHLIBDIRPREFIX leftovers from r284898.
authorbdrewery <bdrewery@FreeBSD.org>
Fri, 18 Sep 2015 22:28:13 +0000 (22:28 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Fri, 18 Sep 2015 22:28:13 +0000 (22:28 +0000)
Sponsored by: EMC / Isilon Storage Division

share/mk/bsd.lib.mk
share/mk/bsd.sys.mk

index dc2e2301e9b867a76d7592763fa71ed7b2ceb395..47db955dc6b707546d25e953757e1d28797b7cdf 100644 (file)
@@ -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
index 71c7af5f18d635c2fa553313d6d21c15384a4b9c..411e816afb0a63c3cce18bbb9e2ceb42bfb11a18 100644 (file)
@@ -186,7 +186,6 @@ staging stage_libs stage_files stage_as stage_links stage_symlinks:
 .else
 # allow targets like beforeinstall to be leveraged
 DESTDIR= ${STAGE_OBJTOP}
-_SHLIBDIRPREFIX= ${STAGE_OBJTOP}
 
 .if commands(beforeinstall)
 .if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"