From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 25 00:19:59 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 474653AA;
 Wed, 25 Jun 2014 00:19:59 +0000 (UTC)
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 3514B2FB1;
 Wed, 25 Jun 2014 00:19:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5P0Jx2c041613;
 Wed, 25 Jun 2014 00:19:59 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5P0JxK8041612;
 Wed, 25 Jun 2014 00:19:59 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201406250019.s5P0JxK8041612@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 25 Jun 2014 00:19:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r267847 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jun 2014 00:19:59 -0000

Author: sjg
Date: Wed Jun 25 00:19:58 2014
New Revision: 267847
URL: http://svnweb.freebsd.org/changeset/base/267847

Log:
  export sanitized MAKESYSPATH in case .../ appears in default syspath.

Modified:
  projects/bmake/share/mk/local.sys.mk

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Wed Jun 25 00:10:41 2014	(r267846)
+++ projects/bmake/share/mk/local.sys.mk	Wed Jun 25 00:19:58 2014	(r267847)
@@ -170,11 +170,17 @@ WITH_STAGING_PROG= yes
 PYTHON ?= /usr/local/bin/python
 
 .if ${.MAKE.LEVEL} == 0
-.if ${MAKESYSPATH:Uno:M*.../*} != ""
-# make sure this is resolved
-MAKESYSPATH:= ${MAKESYSPATH:S,:, ,g:C,\.\.\./.*,${_this:H},:ts:}
+# just in case -m, MAKESYSPATH or our default has .../ 
+# export a sanitised version...
+# first any -m* from command line,
+# then any MAKESYSPATH and finally ${.PARSEDIR}
+_makesyspath:= ${.MAKEFLAGS:tW:S/ -m / -m/g:tw:M-m*:S,^-m,,} \
+	${MAKESYSPATH:U} \
+	${.PARSEDIR}
+# replace .../.* with ${.PARSEDIR}, not perfect but pretty close
+MAKESYSPATH:= ${_makesyspath:S,:, ,g:C,^\.\.\./.*,${.PARSEDIR},:u:ts:}
 .export MAKESYSPATH
-.endif
+
 # this works best if share/mk is ready for it.
 BUILD_AT_LEVEL0= no
 # By default only MACHINE0 updates dependencies