diff options
| author | nebulaeonline <linux@nebulae.online> | 2018-12-23 22:21:32 -0500 |
|---|---|---|
| committer | nebulaeonline <linux@nebulae.online> | 2018-12-23 22:21:32 -0500 |
| commit | 39d32ee40a53deb99a3683fed4574adceca95afe (patch) | |
| tree | 188727bf439ab172dd0428ba64368ff2235c96c5 /src/ir.cpp | |
| parent | 280187031a68c577e84c72add037271153d27c62 (diff) | |
| download | zig-39d32ee40a53deb99a3683fed4574adceca95afe.tar.gz zig-39d32ee40a53deb99a3683fed4574adceca95afe.zip | |
Altered SUBSYSTEM option handling when linking in msvc mode; Added preliminary UEFI support.
Diffstat (limited to 'src/ir.cpp')
| -rw-r--r-- | src/ir.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 83960f2eee..a1432c7b11 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -17872,7 +17872,13 @@ static IrInstruction *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruct if (type_is_invalid(cimport_result->value.type)) return ira->codegen->invalid_instruction; - find_libc_include_path(ira->codegen); + if (ira->codegen->msvc_subsystem != ZigLLVM_MSVC_EFI_APPLICATION && + ira->codegen->msvc_subsystem != ZigLLVM_MSVC_EFI_BOOT_SERVICE_DRIVER && + ira->codegen->msvc_subsystem != ZigLLVM_MSVC_EFI_ROM && + ira->codegen->msvc_subsystem != ZigLLVM_MSVC_EFI_RUNTIME_DRIVER) { + + find_libc_include_path(ira->codegen); + } ImportTableEntry *child_import = allocate<ImportTableEntry>(1); child_import->decls_scope = create_decls_scope(ira->codegen, node, nullptr, nullptr, child_import); |