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.4602.1683676432333492405 for ; Tue, 09 May 2023 16:53:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=Rvt2Cj2N; spf=pass (domain: bsdio.com, ip: 64.147.123.24, mailfrom: rebecca@bsdio.com) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 82C1F320095E; Tue, 9 May 2023 19:53:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 19:53:51 -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=1683676431; x= 1683762831; bh=foKn0xuch7NR9oWUJV7GYAwirV+LXo+z0AR/0PRZEJs=; b=R vt2Cj2N6Ah1OzvuR6JyjZ4tuiZP45td0+BIVAiDEAKJqHUX/BrflM7WB5EnkMPML V4Pp2dmT04B1E66o1dUcoQM/iwE/+iQfLvqGyZWhOyCiRzAf5mgti3uBZiL5fjbW NnyrmS1CYtt7Gl1UxVdViLqaCg6459QtJjVo3SpG+UH7itJ2mkXuDLWgA5BsLmKe lrPmjFiMxPK5iXrg/TmY3c906eS+q35I11J45UuZk0p8GjXCf32Rn7U73S/AwRQA qUWpzetLug4nqvMCZNEOAJfUJ/lVDkrllBSPef05fi2DWzqC9ILVrZdaE9+ieldg wyllTRSJ28K+IdJRz3Jyw== 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=1683676431; x= 1683762831; bh=foKn0xuch7NR9oWUJV7GYAwirV+LXo+z0AR/0PRZEJs=; b=k sqPjqbo84e5hYZuiTeUFH1cAK/QHI1rjk/akhL3LFTVjO4kw1LLOn3Uewphw8DS7 CUIxrorYnIYOXmjwVJZI56Kp/N86WdiEMmzrgxK3wXy5LVpK4lE5g4ikmPr+Wcqk EASC05wSJzwKDPfu5sKSLQ3MOnJncyIct7Qj/TaAaTEdib2mgX+zohfKJ9a55bXs Yr5IhtXbaJCnHfpObuknF2NmysSFxiS7D/xyS920fQZU5GbN/YsLDKVfQk0ZQpM1 nnM+g5CTDutMqjzGMw7k3ckSl3N2FNgEKpzqy5xDzKbdcIoqsLPcL8TrJ0Nlfdib Z5B/CwZQaj+VDFvfNk0GQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:50 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-stable202305 PATCH 4/4] BaseTools: Remove the CLANGCC build rule for Hii-Binary-Package.UEFI_HII Date: Tue, 9 May 2023 17:53:37 -0600 Message-Id: <20230509235337.1815842-5-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 The build rule for Hii-Binary-Package.UEFI_HII should be the same as for GCC, using $(RC) to embed the HII resource into the binary. Since the build rule defaults to GCC, just remove CLANGGCC from the section. Signed-off-by: Rebecca Cran --- BaseTools/Conf/build_rule.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index eb64c62060e1..041146124e87 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -646,5 +646,5 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) -- 2.39.2