Commit d6ba66e50d5f0dbabaf7b56e7eed4b668cd53244 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-08-17 23:18:45-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-08-19 03:41:13-07:00
log	d6ba66e50d5f0dbabaf7b56e7eed4b668cd53244
tree	b0b66e20951e04294edc5c63346b07261c4b02a1
parent	c0b7f20893ea5ca42e0d02b59db6f459c2f80ca1

Sema: avoid false positive error for linking libc

when extern c functions are called.

2 files changed, 9 insertions(+), 8 deletions(-)

src
- Sema.zig
- stage1.zig

src/Sema.zig+8-7

 @@ -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),
             });

src/stage1.zig+1-1

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