Date: Wed, 25 Jun 2014 00:19:59 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267847 - projects/bmake/share/mk Message-ID: <201406250019.s5P0JxK8041612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406250019.s5P0JxK8041612>