From 6af78b59cf0bb5ad194f2ab51b2302d8c45d2543 Mon Sep 17 00:00:00 2001
From: Richard Lowe <richlowe@richlowe.net>
Date: Wed, 9 Aug 2017 13:42:59 -0400
Subject: [PATCH] 8571 Makefile.master should not trust $PATH Reviewed by:
 Toomas Soome <tsoome@me.com> Reviewed by: Peter Tribble
 <peter.tribble@gmail.com> Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
 Approved by: Dan McDonald <danmcd@joyent.com>

---
 usr/src/Makefile.master | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 67d57a47c8..63f087c8e6 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -134,9 +134,16 @@ ELFEXTRACT=	$(ONBLD_TOOLS)/bin/$(MACH)/elfextract
 MBH_PATCH=	$(ONBLD_TOOLS)/bin/$(MACH)/mbh_patch
 BTXLD=		$(ONBLD_TOOLS)/bin/$(MACH)/btxld
 VTFONTCVT=	$(ONBLD_TOOLS)/bin/$(MACH)/vtfontcvt
+# echo(1) and true(1) are specified without absolute paths, so that the shell
+# spawned by make(1) may use the built-in versions.  This is minimally
+# problematic, as the shell spawned by make(1) is known and under control, the
+# only risk being if the shell falls back to $PATH.
+#
+# We specifically want an echo(1) that does interpolation of escape sequences,
+# which ksh93, /bin/sh, and bash will all provide.
 ECHO=		echo
-INS=		install
 TRUE=		true
+INS=		$(ONBLD_TOOLS)/bin/$(MACH)/install
 SYMLINK=	/usr/bin/ln -s
 LN=		/usr/bin/ln
 CHMOD=		/usr/bin/chmod
-- 
2.11.4.GIT