From owner-svn-src-all@freebsd.org Tue Feb 6 15:41:36 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADDEEEE1E68; Tue, 6 Feb 2018 15:41:36 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F7736FBC4; Tue, 6 Feb 2018 15:41:36 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A86D19DEF; Tue, 6 Feb 2018 15:41:36 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w16FfaCo041472; Tue, 6 Feb 2018 15:41:36 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w16FfadO041469; Tue, 6 Feb 2018 15:41:36 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201802061541.w16FfadO041469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Tue, 6 Feb 2018 15:41:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328934 - in head: . bin/sh X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: . bin/sh X-SVN-Commit-Revision: 328934 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Feb 2018 15:41:36 -0000 Author: arichardson Date: Tue Feb 6 15:41:35 2018 New Revision: 328934 URL: https://svnweb.freebsd.org/changeset/base/328934 Log: Don't hardcode /usr/bin as the path for mktemp in build tools It won't work e.g. when crossbuilding from Ubuntu Linux as mktemp is in /bin there. Reviewed By: bdrewery Approved By: jhb (mentor) Differential Revision: https://reviews.freebsd.org/D13937 Modified: head/Makefile.inc1 head/bin/sh/mkbuiltins head/bin/sh/mktokens Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 6 15:41:26 2018 (r328933) +++ head/Makefile.inc1 Tue Feb 6 15:41:35 2018 (r328934) @@ -463,7 +463,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # when in the middle of installing over this system. # .if make(distributeworld) || make(installworld) || make(stageworld) -INSTALLTMP!= /usr/bin/mktemp -d -u -t install +INSTALLTMP!= mktemp -d -u -t install .endif .if make(stagekernel) || make(distributekernel) Modified: head/bin/sh/mkbuiltins ============================================================================== --- head/bin/sh/mkbuiltins Tue Feb 6 15:41:26 2018 (r328933) +++ head/bin/sh/mkbuiltins Tue Feb 6 15:41:35 2018 (r328934) @@ -34,7 +34,7 @@ # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 # $FreeBSD$ -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` havehist=1 if [ "X$1" = "X-h" ]; then havehist=0 Modified: head/bin/sh/mktokens ============================================================================== --- head/bin/sh/mktokens Tue Feb 6 15:41:26 2018 (r328933) +++ head/bin/sh/mktokens Tue Feb 6 15:41:35 2018 (r328934) @@ -38,7 +38,7 @@ # token marks the end of a list. The third column is the name to print in # error messages. -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` cat > $temp <<\! TEOF 1 end of file TNL 0 newline