Skip to content

Commit ac9a6ee

Browse files
apop5mergify[bot]
authored andcommitted
BaseTools: build_rule.template generate a different dll for wholearchive.
When running the /wholearchive test build, generate the test .dll as a different filename to prevent the system holding onto the dll file too long and generating a build error that the actual dll cannot be found. Remove the temporary file after it was generated because the successful completion of the link command is the test case. Signed-off-by: Aaron Pop <aaronpop@microsoft.com>
1 parent f35d3a5 commit ac9a6ee

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

BaseTools/Conf/build_rule.template

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@
287287
$(DEBUG_DIR)(+)$(MODULE_NAME).dll
288288

289289
<Command.MSFT, Command.INTEL>
290-
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
290+
"$(DLINK)" /OUT:${dst}.wtemp $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
291+
$(RM) ${dst}.wtemp
291292
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
292293

293294
<Command.CLANGPDB>
@@ -312,7 +313,8 @@
312313
$(DEBUG_DIR)(+)$(MODULE_NAME).dll
313314

314315
<Command.MSFT>
315-
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_XIPFLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
316+
"$(DLINK)" /OUT:${dst}.wtemp $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_XIPFLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
317+
$(RM) ${dst}.wtemp
316318
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_XIPFLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
317319

318320
<Command.GCC>

0 commit comments

Comments
 (0)