mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 08:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: avoid false positive error for linking libc

Browse Source 
when extern c functions are called.
This commit is contained in:
Andrew Kelley 2022-08-17 23:18:45 -07:00
parent c0b7f20893
commit d6ba66e50d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Sema.zig
View File

@ -7567,10 +7567,11 @@ fn handleExternLibName(
) CompileError![:0]u8 {
blk: {
const mod = sema.mod;
const comp = mod.comp;
const target = mod.getTarget();
log.debug("extern fn symbol expected in lib '{s}'", .{lib_name});
if (target_util.is_libc_lib_name(target, lib_name)) {
if (!mod.comp.bin_file.options.link_libc) {
if (!comp.bin_file.options.link_libc and !comp.bin_file.options.parent_compilation_link_libc) {
return sema.fail(
block,
src_loc,
@ -7578,11 +7579,11 @@ fn handleExternLibName(
.{},
);
}
mod.comp.bin_file.options.link_libc = true;
comp.bin_file.options.link_libc = true;
break :blk;
}
if (target_util.is_libcpp_lib_name(target, lib_name)) {
if (!mod.comp.bin_file.options.link_libcpp) {
if (!comp.bin_file.options.link_libcpp) {
return sema.fail(
block,
src_loc,
@ -7590,14 +7591,14 @@ fn handleExternLibName(
.{},
);
}
mod.comp.bin_file.options.link_libcpp = true;
comp.bin_file.options.link_libcpp = true;
break :blk;
}
if (mem.eql(u8, lib_name, "unwind")) {
mod.comp.bin_file.options.link_libunwind = true;
comp.bin_file.options.link_libunwind = true;
break :blk;
}
if (!target.isWasm() and !mod.comp.bin_file.options.pic) {
if (!target.isWasm() and !comp.bin_file.options.pic) {
return sema.fail(
block,
src_loc,
@ -7605,7 +7606,7 @@ fn handleExternLibName(
.{ lib_name, lib_name },
);
}
mod.comp.stage1AddLinkLib(lib_name) catch |err| {
comp.stage1AddLinkLib(lib_name) catch |err| {
return sema.fail(block, src_loc, "unable to add link lib '{s}': {s}", .{
lib_name, @errorName(err),
});

2
src/stage1.zig
View File

@ -416,7 +416,7 @@ export fn stage2_add_link_lib(
const target = comp.getTarget();
const is_libc = target_util.is_libc_lib_name(target, lib_name);
if (is_libc) {
if (!comp.bin_file.options.link_libc) {
if (!comp.bin_file.options.link_libc and !comp.bin_file.options.parent_compilation_link_libc) {
return "dependency on libc must be explicitly specified in the build command";
}
return null;