From nobody Tue Aug 22 17:53:29 2023 X-Original-To: dev-commits-src-all@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 4RVcQf3Q4Zz4rCGw; Tue, 22 Aug 2023 17:53:30 +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 4RVcQd63yMz3M0p; Tue, 22 Aug 2023 17:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726809; 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=Ck0/lSRixWa/y5jx//2TT8y4E9kiZ3v+pe2A+OQ8e9M=; b=NfyzHZwz8FP90NOwJ8R6/rnvzqha9QEO8Si1nV4CqowS6rdfmy2lFoqPb/15+VL3JVfu9X mlORxzmxIFYs2UslQFWJRC07vS4oErnebvsplKOMLRJAKaFvnGpgHM1rbw/Gz79wPd5oKc MOUSo23ry0fvGxAVpnj4afn/TckWFWweT2BZML3gOAmaFPnTPLgbeOmRhzMLF+sdHrx4di HdjKC3UZStY8TULBDQIlSVZDFjyqldq09nGjcbBD/eB5rMKzAZfTvpA70xoUiGhRpA8V8S hbCSxsm1HQgqgYCbJDgXiIXFxAE+mEl5DoWB4WXiTeKTp/jDj8MDMXXJ1NcDfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726809; 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=Ck0/lSRixWa/y5jx//2TT8y4E9kiZ3v+pe2A+OQ8e9M=; b=sjyHSppz6PIdSnJxaynn18PdFtyJEbgvjXcVJBtHlai/+iMP0ldWQRLNifPHyR/9j00NNH GrFQMjw6n3wSsdwbLzFTLDtqur7zp8tVAlYlVnUsYAE0+U9NmJXits6lFM4k684NYI1Aph KNcuAj7VtU/EJS7H3OvibwqwG9whdH3REPlOKRG19slBy8f9X9856Gv7sWcCqxHFZJtG98 WZj5EOwaJ6JSKTlGkjTiho8Dj4OpE/D1QqWnTFJccx0peF29y3+hpJKB5FKt2XiVG7uov5 yXirg/mj9IUjTIy9U1gIaHCE6C/KaJypIRjVMHBYl/1SwK4wujOGfhREV1zxSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692726809; a=rsa-sha256; cv=none; b=UrOUqgj4CcI/mCUqKOw7OsyK/4xZzHmp+dxlAC7IpmS6YHPqsFFj19WL2B/+OvpdN9E0kJ ZotBH0yTRODqNR8BsjrT6IhCXSvxCvWn30IHCLvb8Il8IQbps0jBoDD225j1JYV91DzfN/ +NIACJkASK/f49sJtEFQo8G39v8qNiA7El32odsbaoXsTVBoFSsnnWLM4hXt/HIAMttw73 GB1QcbubWB4tdk7GMrBK2JoYR6bcb2OVLOrNJ93k+LOThl73DZdkTk2Jhd34x7yZ0Cz0sO HDJ0lDVSNbC3gFPurH86QnNlG6ZZckXxob9EB7JWyaWH8umBpOS22B2/SITcng== 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 4RVcQd57Dwz1C8T; Tue, 22 Aug 2023 17:53:29 +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 37MHrTV8066591; Tue, 22 Aug 2023 17:53:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MHrT88066588; Tue, 22 Aug 2023 17:53:29 GMT (envelope-from git) Date: Tue, 22 Aug 2023 17:53:29 GMT Message-Id: <202308221753.37MHrT88066588@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: 5157b451c654 - main - tools/build/make.py: Grow the list of MI targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5157b451c65480deecbc0e7c223684830a4af7ce Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5157b451c65480deecbc0e7c223684830a4af7ce commit 5157b451c65480deecbc0e7c223684830a4af7ce Author: Jessica Clarke AuthorDate: 2023-08-22 17:53:13 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 17:53:13 +0000 tools/build/make.py: Grow the list of MI targets --- tools/build/make.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/build/make.py b/tools/build/make.py index 7ae6a95e8c23..74454aa51b08 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -48,6 +48,24 @@ import sys from pathlib import Path +# List of targets that are independent of TARGET/TARGET_ARCH and thus do not +# need them to be set. Keep in the same order as Makefile documents them (if +# they are documented). +mach_indep_targets = [ + "cleanuniverse", + "universe", + "universe-toolchain", + "tinderbox" + "worlds", + "kernels", + "kernel-toolchains", + "targets", + "toolchains", + "makeman", + "sysent", +] + + def run(cmd, **kwargs): cmd = list(map(str, cmd)) # convert all Path objects to str debug("Running", cmd) @@ -190,7 +208,7 @@ if __name__ == "__main__": new_env_vars = {} if not sys.platform.startswith("freebsd"): if not is_make_var_set("TARGET") or not is_make_var_set("TARGET_ARCH"): - if "universe" not in sys.argv and "tinderbox" not in sys.argv: + if not set(sys.argv).intersection(set(mach_indep_targets)): sys.exit("TARGET= and TARGET_ARCH= must be set explicitly " "when building on non-FreeBSD") if not parsed_args.bootstrap_toolchain: