From 64ec67921de8e91ab879af120c388a8638561827 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:47 +0000 Subject: [PATCH] Disallow using a colon ':' in source checkout paths. This leaks into the PATH handling for WORLDTMP and breaks finding cross-tools. The PATH handling could be fixed to properly quote but is not worth the effort. Also allow this sanity check to always run even with 'make -n'. MFC after: 2 weeks Sponsored by: Dell EMC Isilon --- Makefile.inc1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f3c05a949084..54e6fefffe66 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -752,14 +752,20 @@ KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -_sanity_check: .PHONY +_sanity_check: .PHONY .MAKE .if ${.CURDIR:C/[^,]//g} != "" # The m4 build of sendmail files doesn't like it if ',' is used # anywhere in the path of it's files. @echo @echo "*** Error: path to source tree contains a comma ','" @echo - false + @false +.elif ${.CURDIR:M*\:*} != "" +# Using ':' leaks into PATH and breaks finding cross-tools. + @echo + @echo "*** Error: path to source tree contains a colon ':'" + @echo + @false .endif _worldtmp: .PHONY