From nobody Tue Aug 22 17:53:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVcQc5kK3z4rC5N; Tue, 22 Aug 2023 17:53:28 +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 4RVcQc54VLz3LZD; Tue, 22 Aug 2023 17:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZaA8izJQe168CmSVyftl/kJb3y7UDFaIGnTvyb3/EU=; b=p2nRHdEbqk45xoSr2MxUZo/NjkygtAqQkUECJQBHlSvcnIT5PWPmlKL1RPPcZx2A1ubQ1m 6qViqxw+HLSO34ecCDoXINi4UAK6P3Jhr72xjiiRSt2n8omkL9AQb/UXYhAihQi7OPZ7oW Y/qqW9nwcQF4PKzsiCeLBpqjPoeAxhLuFoI0E8uTn+Wp+M3CcP3+OnddT4Vo7mCIS0wz0X BXUJwn62bftklH3IrIX9u4w2CxcHCYna33hLyrR7AN7aCtQsN3vN9TKMrmTBdBEArFvLAU 0SOvxRIQMm4hWULmZyqQwEzs9wOV6NX/OwL2x/BDOGZNfjniAX4r7tpOC8cxvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZaA8izJQe168CmSVyftl/kJb3y7UDFaIGnTvyb3/EU=; b=fzmqQSNdBG0YdRwGWInH3IVJaYqGmI+Ro7/oUAZsBvM+1jMuxq5xlRUST1Jq3z+M0GFJLG kFzJxEWIwJRsy70E8nWmVGxpUu1wvmgmrJZKbvEaKInV12x2+uWOe+yIxLRLyFO4EU8dAd E/nVHDQ5KjbjAt6U/tONwY9kSwwQ3O84bjrYXkst/xQhVHFSMh5BKLEVDb/s1Gyc+SkFq7 NgZQ1H8eAi3aUIlvqO/ckXLbRR6kE5DnF0I/LhrSuYSDIvvEaRkbE1E7kw8O4N7CWhjzP9 TV2HUDjVVsvY+29UMw/pcLwJl8dtRbB+B8xQCTdPp/zike4lnvOSRD0oso2wdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692726808; a=rsa-sha256; cv=none; b=OcWuD2Vt+RmDA5Xv8aYcw3wnPIl0W+s9cCRgLCrWAh66S1zf+82gm1YLuZYwJLFoRCNFW+ 3HY9WTLHmQS7lYafa5m0tjXabgJG+/ueYzVhliOf4gQYSbfOyjz5WmeFEqrnUWBAfA4lAT Fy8IB9dlcNsIeT6sV9T9wCMsf2yK6FPmadVQYOw7m7fIoI2st9ZrrFFoCvNCS5TQ05+3Lo lQj/qnQUe0FiSla53sfGlVmbsVdG2wanndF6niEfx2JVRjY/AgqMciS25u8j20YEs/pIN7 8SNkOi6/JpzQf7qy5jA9O0s17HF0N/8CCOUI6Kw58OM9bcTVASxoIisl3NHdMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RVcQc47bKz1BwR; Tue, 22 Aug 2023 17:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MHrSnF066543; Tue, 22 Aug 2023 17:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MHrSfB066540; Tue, 22 Aug 2023 17:53:28 GMT (envelope-from git) Date: Tue, 22 Aug 2023 17:53:28 GMT Message-Id: <202308221753.37MHrSfB066540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3b4da25ead62 - main - tools/build/make.py: Make flake8 clean List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b4da25ead62c346d05199bc96cd6935e896849f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3b4da25ead62c346d05199bc96cd6935e896849f commit 3b4da25ead62c346d05199bc96cd6935e896849f Author: Jessica Clarke AuthorDate: 2023-08-22 17:52:57 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 17:52:57 +0000 tools/build/make.py: Make flake8 clean --- tools/build/make.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build/make.py b/tools/build/make.py index 05c095e10172..7ae6a95e8c23 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -112,6 +112,7 @@ def check_required_make_env_var(varname, binary_name, bindir): if parsed_args.debug: run([guess, "--version"]) + def check_xtool_make_env_var(varname, binary_name): # Avoid calling brew --prefix on macOS if all variables are already set: if os.getenv(varname): @@ -122,6 +123,7 @@ def check_xtool_make_env_var(varname, binary_name): return check_required_make_env_var(varname, binary_name, parsed_args.cross_bindir) + def default_cross_toolchain(): # default to homebrew-installed clang on MacOS if available if sys.platform.startswith("darwin"): @@ -249,7 +251,7 @@ if __name__ == "__main__": and not is_make_var_set("WITHOUT_CLEAN")): # Avoid accidentally deleting all of the build tree and wasting lots of # time cleaning directories instead of just doing a rm -rf ${.OBJDIR} - want_clean = input("You did not set -DWITHOUT_CLEAN/--clean/--no-clean." + want_clean = input("You did not set -DWITHOUT_CLEAN/--(no-)clean." " Did you really mean to do a clean build? y/[N] ") if not want_clean.lower().startswith("y"): bmake_args.append("-DWITHOUT_CLEAN")