summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2017-08-09 13:42:59 -0400
committerRichard Lowe <richlowe@richlowe.net>2018-01-27 21:41:20 +0000
commit6af78b59cf0bb5ad194f2ab51b2302d8c45d2543 (patch)
treef4cf0fecb1737c666593ba252fad24f546227857
parentf864f99efe57685e1762590c1a880dd16bca6da9 (diff)
downloadillumos-joyent-6af78b59cf0bb5ad194f2ab51b2302d8c45d2543.tar.gz
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>
-rw-r--r--usr/src/Makefile.master9
1 files changed, 8 insertions, 1 deletions
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