public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Rebecca Cran" <rebecca@bsdio.com>
To: devel@edk2.groups.io, Liming Gao <gaoliming@byosoft.com.cn>,
	Bob Feng <bob.c.feng@intel.com>,
	Yuwei Chen <yuwei.chen@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
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	[thread overview]
Message-ID: <20230509235337.1815842-5-rebecca@bsdio.com> (raw)
In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com>

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 <rebecca@bsdio.com>
---
 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 @@
     <Command.GCC>
         "$(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}
-    <Command.XCODE, Command.CLANGGCC>
+    <Command.XCODE>
         "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
-- 
2.39.2


  parent reply	other threads:[~2023-05-09 23:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09 23:53 [edk2-stable202305 PATCH 0/4] BaseTools: Fix CLANGDWARF HII resource rules and paths Rebecca Cran
2023-05-09 23:53 ` [edk2-stable202305 PATCH 1/4] BaseTools: Remove BUILDRULEFAMILY from CLANGDWARF in tools_def.template Rebecca Cran
2023-05-09 23:53 ` [edk2-stable202305 PATCH 2/4] BaseTools: Set the CLANGDWARF OBJCOPY path " Rebecca Cran
2023-05-10 11:03   ` [edk2-devel] " Ard Biesheuvel
2023-05-10 12:09     ` Rebecca Cran
2023-05-10 12:10       ` Ard Biesheuvel
2023-05-10 12:33         ` Rebecca Cran
2023-05-09 23:53 ` [edk2-stable202305 PATCH 3/4] BaseTools: Set CLANGDWARF RC path to llvm-objcopy " Rebecca Cran
2023-05-09 23:53 ` Rebecca Cran [this message]
2023-05-10  2:36 ` [edk2-devel] [edk2-stable202305 PATCH 0/4] BaseTools: Fix CLANGDWARF HII resource rules and paths Michael D Kinney
2023-05-10  2:40   ` Rebecca Cran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230509235337.1815842-5-rebecca@bsdio.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox