summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2014-05-10 00:26:40 +0000
committersjg <sjg@FreeBSD.org>2014-05-10 00:26:40 +0000
commit6ef8a250e02c75b24ef880c555b16fdaf169bab3 (patch)
tree983c05653fae52b959c6a47b3802951563e2f526
parent8f0a10ad34f3b383c9e6a225039819f2b39f9ff2 (diff)
downloadFreeBSD-src-6ef8a250e02c75b24ef880c555b16fdaf169bab3.zip
FreeBSD-src-6ef8a250e02c75b24ef880c555b16fdaf169bab3.tar.gz
We may need to supress SHLIB_LINKS with NO_SHLIB_LINKS
-rw-r--r--share/mk/meta.stage.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/meta.stage.mk b/share/mk/meta.stage.mk
index 8498adf..63cef7f 100644
--- a/share/mk/meta.stage.mk
+++ b/share/mk/meta.stage.mk
@@ -135,12 +135,14 @@ STAGE_LIBS ?= ${.ALLSRC:N.dirdep}
stage_libs: .dirdep
@${STAGE_FILE_SCRIPT}; StageFiles ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${STAGE_LIBS}
+.if !defined(NO_SHLIB_LINKS)
.if !empty(SHLIB_LINKS)
@${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} \
${SHLIB_LINKS:@t@${STAGE_LIBS:T:M$t.*} $t@}
.elif !empty(SHLIB_LINK) && !empty(SHLIB_NAME)
@${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${SHLIB_NAME} ${SHLIB_LINK} ${SYMLINKS:T}
.endif
+.endif
@touch $@
.endif
OpenPOWER on IntegriCloud