Author: bdrewery
Date: Sun Oct 29 01:20:47 2017
New Revision: 325069
URL: https://svnweb.freebsd.org/changeset/base/325069

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Sun Oct 29 01:20:43 2017        (r325068)
+++ head/Makefile.inc1  Sun Oct 29 01:20:47 2017        (r325069)
@@ -752,14 +752,20 @@ KMAKE=            ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} 
${KERNEL_FLA
 # 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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to