diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-13 20:25:30 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-13 20:25:30 +0000 |
| commit | 44bbe58fa1f4039b8920495824cb860f7bce7868 (patch) | |
| tree | ab8abfdcb54c7dbfb9661dec3ff4bbedfdee8915 /share/mk | |
| parent | c1e50becc4d8ed40a334d74b71f782486ecb6a13 (diff) | |
| download | FreeBSD-src-44bbe58fa1f4039b8920495824cb860f7bce7868.zip FreeBSD-src-44bbe58fa1f4039b8920495824cb860f7bce7868.tar.gz | |
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
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.sys.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 4a4e080..cad2b2f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -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} |
