From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.4598.1683676426945107378 for ; Tue, 09 May 2023 16:53:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=v2PYBrCf; spf=pass (domain: bsdio.com, ip: 64.147.123.24, mailfrom: rebecca@bsdio.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 29C88320095F; Tue, 9 May 2023 19:53:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 09 May 2023 19:53:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1683676425; x= 1683762825; bh=Oe6qxfXo3I+ZsIoR7psVRaITTn3b/IuoI47iKlM9PeI=; b=v 2PYBrCffKEWGlfpEMB0iYLbV4kwSWid4nzjugQZv/ou4QhzPWBooMxEmZ6dO3rXk fU8a1b+Kbmmq87wEu5iLKlE59064MFsKo0YH9BzwhyRl12Fexy+ztYq9XEvc8zJy 1Wj9HHYOrDD2hjfnC9gfLPCvKvotuIOkeIm/R8/jUuYfiYXCaZHLIr/uCzIwStHk aET6BNHWY/AXvY/1kPY2kkLhm1gBCSiBPzYlqSnBtzkPpxDo09+K0nKYZ3H+PMXQ KhWVF7VrwsE6DO8y/ToyEj7m66bkh4X0TxSaoOL1Mn3l0KbYMiPcM/BESmEuZMda /qxXiEL2HF+f10DlYybhg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1683676425; x= 1683762825; bh=Oe6qxfXo3I+ZsIoR7psVRaITTn3b/IuoI47iKlM9PeI=; b=P f3ySYDWy5dnf1kBtLP8afMWk2g+tTiY2DPUhaK/pU6PC9Ne64RCj6n1KCvl6uf/O fy82B4t8Cc3KQw4j5Y1z7oqUXNsxX9g+IsBgEHo9isWASl3UY20GqcPh4aHTiBK2 fj+QZAI9IX07PmysRb7gR7X5NWJQLDEtUgPhU6i+NWksci/Nz5xE7DF0NngKI2yT lH7uqdDQoWE3uvqlpFgTcilkEEZ96pGiKNN2NO1JkUn6XMOS1qT6LjK79ANXCvzi fkkhAxkfbHuSM/UkiJAe3WtJoZtnY3tGoB5TBN7tn5lJK4x2JIgbSQaoJGW+02KZ vCZ2K6xyyYdpdokKeGj8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:44 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-stable202305 PATCH 1/4] BaseTools: Remove BUILDRULEFAMILY from CLANGDWARF in tools_def.template Date: Tue, 9 May 2023 17:53:34 -0600 Message-Id: <20230509235337.1815842-2-rebecca@bsdio.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com> References: <20230509235337.1815842-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit There's only a single rule in build_rule.template for CLANGGCC, and it's incorrect. We should instead just use the rules for GCC, so remove the BUILDRULEFAMILY line for the CLANGDWARF toolchain definition. Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index e096aadb495d..8ed9cd3da4fa 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1834,7 +1834,7 @@ NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable # #################################################################################### *_CLANGDWARF_*_*_FAMILY = GCC -*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGGCC + *_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make *_CLANGDWARF_*_*_DLL = ENV(CLANGDWARF_DLL) *_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) -- 2.39.2