diff --git a/src/linker/lnk.c b/src/linker/lnk.c index a2d2e1ab..0a2621ee 100644 --- a/src/linker/lnk.c +++ b/src/linker/lnk.c @@ -1665,8 +1665,11 @@ lnk_build_link_context(TP_Context *tp, TP_Arena *tp_arena, LNK_Config *config) case State_InputDelayLoadDlls: { ProfBegin("Input Delay Load Dlls"); + // skip input delay load dlls for (; *last_delay_load_dll; last_delay_load_dll = &(*last_delay_load_dll)->next); + // establish delay load helper name + config->delay_load_helper_name = mscrt_delay_load_helper_name_from_machine(config->machine); // TODO: config_refactor String8List value_strings = {0}; str8_list_push(scratch.arena, &value_strings, config->delay_load_helper_name); diff --git a/src/linker/lnk_config.c b/src/linker/lnk_config.c index b11430fe..78799391 100644 --- a/src/linker/lnk_config.c +++ b/src/linker/lnk_config.c @@ -2006,6 +2006,7 @@ lnk_config_from_cmd_line(Arena *arena, String8List raw_cmd_line, LNK_CmdLine cmd config->export_ht = hash_table_init(arena, max_U16/2); config->alt_name_ht = hash_table_init(arena, 0x100); config->include_symbol_ht = hash_table_init(arena, 0x100); + config->delay_load_ht = hash_table_init(arena, 0x100); // process command line switches for (LNK_CmdOption *cmd = cmd_line.first_option; cmd != 0; cmd = cmd->next) {