svn commit: r290801 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Fri Nov 13 20:25:32 UTC 2015
Author: bdrewery
Date: Fri Nov 13 20:25:30 2015
New Revision: 290801
URL: https://svnweb.freebsd.org/changeset/base/290801
Log:
Revert r290740.
Discussing with sjg@, we agree the better fix is to be done in meta.stage.mk.
This also broke staging of SYMLINKS for non-shared libraries, such as for
lib/libcompiler_rt, which results in all Makefile.depend removing it.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Fri Nov 13 19:59:22 2015 (r290800)
+++ head/share/mk/bsd.sys.mk Fri Nov 13 20:25:30 2015 (r290801)
@@ -276,8 +276,7 @@ STAGE_SETS+= links
STAGE_LINKS.links= ${LINKS}
.endif
-# Don't handle SYMLINKS for libraries since stage_libs is already doing so.
-.if !empty(SYMLINKS) && empty(_LIBS)
+.if !empty(SYMLINKS)
STAGE_TARGETS+= stage_symlinks
STAGE_SETS+= links
STAGE_SYMLINKS.links= ${SYMLINKS}
More information about the svn-src-all
mailing list