From owner-svn-src-user@FreeBSD.ORG Sat Jun 13 23:12:07 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 935C2559;
Sat, 13 Jun 2015 23:12:07 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8210CC75;
Sat, 13 Jun 2015 23:12:07 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DNC72d067283;
Sat, 13 Jun 2015 23:12:07 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DNC7gh067282;
Sat, 13 Jun 2015 23:12:07 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201506132312.t5DNC7gh067282@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 13 Jun 2015 23:12:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r284362 - user/ngie/more-tests/share/mk
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2015 23:12:07 -0000
Author: ngie
Date: Sat Jun 13 23:12:06 2015
New Revision: 284362
URL: https://svnweb.freebsd.org/changeset/base/284362
Log:
Restore the more complicated logic removed in r280122 so fmake can bootstrap
bmake for buildworld
Modified:
user/ngie/more-tests/share/mk/bsd.links.mk
Modified: user/ngie/more-tests/share/mk/bsd.links.mk
==============================================================================
--- user/ngie/more-tests/share/mk/bsd.links.mk Sat Jun 13 22:54:46 2015 (r284361)
+++ user/ngie/more-tests/share/mk/bsd.links.mk Sat Jun 13 23:12:06 2015 (r284362)
@@ -7,6 +7,7 @@
afterinstall: _installlinks
.ORDER: realinstall _installlinks
_installlinks:
+.ifdef .PARSEDIR
.for s t in ${LINKS}
@${ECHO} "$t -> $s" ;\
${INSTALL_LINK} ${DESTDIR}$s ${DESTDIR}$t
@@ -15,3 +16,27 @@ _installlinks:
@${ECHO} "$t -> $s" ;\
${INSTALL_SYMLINK} $s ${DESTDIR}/$t
.endfor
+.else # The following logic is needed for FMAKE in the bootstrapping process
+.if defined(LINKS) && !empty(LINKS)
+ @set ${LINKS}; \
+ while test $$# -ge 2; do \
+ l=${DESTDIR}$$1; \
+ shift; \
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
+ ${INSTALL_LINK} $$l $$t; \
+ done; true
+.endif
+.if defined(SYMLINKS) && !empty(SYMLINKS)
+ @set ${SYMLINKS}; \
+ while test $$# -ge 2; do \
+ l=$$1; \
+ shift; \
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
+ ${INSTALL_SYMLINK} $$l $$t; \
+ done; true
+.endif
+.endif