d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Garbage collect _SHLIBDIRPREFIX leftovers from r284898.

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-09-18 22:28:13 +00:00
parent 978e1d6629
commit db31773f3e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/mk/bsd.lib.mk
View 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

1
share/mk/bsd.sys.mk
View 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"