From ba5390def9a3664bc129cbf355ae00507eb825ea Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 12 Jan 2018 14:09:41 -0500 Subject: [PATCH] build: run uname only in usr/src/pkg Keeping SETLEGACYUNAME in Makefile.master caused dmake to evaluate it on what appeared to be every invocation of make. Since the only consumers of it are in pkg, moving the assignment there reduces the amount of useless evaluation. --- usr/src/Makefile.master | 1 - usr/src/pkg/Makefile | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 057887a82e..09e8e46365 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -142,7 +142,6 @@ TAR= /usr/bin/tar ASTBINDIR= /usr/ast/bin MSGCC= $(ASTBINDIR)/msgcc MSGFMT= /usr/bin/msgfmt -s -SETLEGACYUNAME:sh= if [ `uname` != SunOS ]; then echo puname; fi FILEMODE= 644 DIRMODE= 755 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index 1024638f2c..80f8ed0456 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -47,6 +47,9 @@ SUPPRESSPKGDEP= false # PKGDEBUG= @ +# Hackery to deal with uname transition +SETLEGACYUNAME:sh= if [ `uname` != SunOS ]; then echo puname; fi + # # Cross platform packaging notes # -- 2.11.4.GIT