From owner-dev-commits-src-branches@freebsd.org Sat Apr 10 13:30:00 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id F10BA5E6D1C;
Sat, 10 Apr 2021 13:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4FHbTM39cbz3Jpt;
Sat, 10 Apr 2021 13:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D7B91223C;
Sat, 10 Apr 2021 13:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ADTxmq001966;
Sat, 10 Apr 2021 13:29:59 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ADTxwx001964;
Sat, 10 Apr 2021 13:29:59 GMT (envelope-from git)
Date: Sat, 10 Apr 2021 13:29:59 GMT
Message-Id: <202104101329.13ADTxwx001964@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alex Richardson <arichardson@FreeBSD.org>
Subject: git: 0a0e327fad67 - stable/13 - tools/build/make.py: Don't call brew
--prefix if --cross-bindir is set
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: arichardson
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0a0e327fad6745fa48091cbdaeb6fea36ac5dd69
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Apr 2021 13:30:00 -0000
The branch stable/13 has been updated by arichardson:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a0e327fad6745fa48091cbdaeb6fea36ac5dd69
commit 0a0e327fad6745fa48091cbdaeb6fea36ac5dd69
Author: Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2021-02-26 17:49:03 +0000
Commit: Alex Richardson <arichardson@FreeBSD.org>
CommitDate: 2021-04-10 12:56:02 +0000
tools/build/make.py: Don't call brew --prefix if --cross-bindir is set
Also updated the logic to use subprocess.run() instead of the old
subprocess.getoutput() which also includes stderr and therefore
can trigger an exception inside Path().exists().
Reported by: gnn
(cherry picked from commit a26ace4db6d974215a4d882948da80eae2b3b0d4)
---
tools/build/make.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/tools/build/make.py b/tools/build/make.py
index bc6d8fb449bb..c34147f6ac21 100755
--- a/tools/build/make.py
+++ b/tools/build/make.py
@@ -124,9 +124,14 @@ def default_cross_toolchain():
# default to homebrew-installed clang on MacOS if available
if sys.platform.startswith("darwin"):
if shutil.which("brew"):
- llvm_dir = subprocess.getoutput("brew --prefix llvm")
- if llvm_dir and Path(llvm_dir, "bin").exists():
- return str(Path(llvm_dir, "bin"))
+ llvm_dir = subprocess.run(["brew", "--prefix", "llvm"],
+ capture_output=True).stdout.strip()
+ debug("Inferred LLVM dir as", llvm_dir)
+ try:
+ if llvm_dir and Path(llvm_dir.decode("utf-8"), "bin").exists():
+ return str(Path(llvm_dir.decode("utf-8"), "bin"))
+ except OSError:
+ return None
return None
@@ -137,7 +142,7 @@ if __name__ == "__main__":
help="Directory to look for cc/c++/cpp/ld to build "
"host (" + sys.platform + ") binaries",
default="/usr/bin")
- parser.add_argument("--cross-bindir", default=default_cross_toolchain(),
+ parser.add_argument("--cross-bindir", default=None,
help="Directory to look for cc/c++/cpp/ld to build "
"target binaries (only needed if XCC/XCPP/XLD "
"are not set)")
@@ -165,6 +170,8 @@ if __name__ == "__main__":
except ImportError:
pass
parsed_args, bmake_args = parser.parse_known_args()
+ if parsed_args.cross_bindir is None:
+ parsed_args.cross_bindir = default_cross_toolchain()
MAKEOBJDIRPREFIX = os.getenv("MAKEOBJDIRPREFIX")
if not MAKEOBJDIRPREFIX: