BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=557
Build a nul lib in [Hii-Binary-Package.UEFI_HII] so the makefile
dependencies are satisfied.
Add --rc to Genfw in [Dynamic-Library-File] to inject the *hii.rc
data if it exists.
Signed-off-by: Andrew Fish <af...@apple.com>
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Signed-off-by: Andrew Fish <af...@apple.com>
---
BaseTools/Conf/build_rule.template | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Conf/build_rule.template
b/BaseTools/Conf/build_rule.template
index 0822b681fcd9..00f729a40003 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -393,7 +393,7 @@
"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src}
$(DEBUG_DIR)(+)$(MODULE_NAME).pecoff
# create symbol file for GDB debug
-$(DSYMUTIL) ${src}
- "$(GENFW)" -e $(MODULE_TYPE) -o ${dst}
$(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)
+ "$(GENFW)" -e $(MODULE_TYPE) --rc $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
-o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)
$(CP) ${dst} $(DEBUG_DIR)
$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
@@ -645,10 +645,10 @@
<InputFile>
*.hpk
- <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC, OutputFile.CLANGPDB>
+ <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC, OutputFile.CLANGPDB,
OutputFile.XCODE>
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib
- <OutputFile.XCODE, OutputFile.RVCT>
+ <OutputFile.RVCT>
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
<Command.MSFT, Command.INTEL, Command.CLANGPDB>
@@ -659,5 +659,12 @@
"$(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.RVCT>
+ <Command.RVCT>
GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID)
--hiibinpackage $(HII_BINARY_PACKAGES)
+
+ <Command.XCODE>
+ GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID)
--hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
+ # Fake a lib that is empty for a make dependency like toolchains with
a real RC tool.
+ echo "int aksdlfjlksdfjlksslkdfj;" >
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.hhi.c;
+ "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -o
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.hii.o $(INC)
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.hhi.c
+ "$(SLINK)" $(SLINK_FLAGS) ${dst}
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.hii.o
--
2.24.1 (Apple Git-126)
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60196): https://edk2.groups.io/g/devel/message/60196
Mute This Topic: https://groups.io/mt/74445736/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
