From c76a98f28a2623d0622b373f3b6d9aa23c3da54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 8 Oct 2024 06:42:42 +0200 Subject: [PATCH] std.Target: Rename is_lib{c,cxx}_lib_name() to isLib{C,Cxx}LibName(). --- lib/std/Build/Module.zig | 4 ++-- lib/std/Build/Step/Compile.zig | 4 ++-- lib/std/Target.zig | 4 ++-- src/Sema.zig | 4 ++-- src/main.zig | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/std/Build/Module.zig b/lib/std/Build/Module.zig index 253945b3d7..76d1bf8816 100644 --- a/lib/std/Build/Module.zig +++ b/lib/std/Build/Module.zig @@ -492,11 +492,11 @@ pub fn linkSystemLibrary( const b = m.owner; const target = m.requireKnownTarget(); - if (target.is_libc_lib_name(name)) { + if (target.isLibCLibName(name)) { m.link_libc = true; return; } - if (target.is_libcpp_lib_name(name)) { + if (target.isLibCxxLibName(name)) { m.link_libcpp = true; return; } diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig index a977dc3056..6a9ed48a9d 100644 --- a/lib/std/Build/Step/Compile.zig +++ b/lib/std/Build/Step/Compile.zig @@ -611,11 +611,11 @@ pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool { is_linking_libcpp = is_linking_libcpp or module.link_libcpp == true; } - if (compile.rootModuleTarget().is_libc_lib_name(name)) { + if (compile.rootModuleTarget().isLibCLibName(name)) { return is_linking_libc; } - if (compile.rootModuleTarget().is_libcpp_lib_name(name)) { + if (compile.rootModuleTarget().isLibCxxLibName(name)) { return is_linking_libcpp; } diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 0969da1a50..00f883d30e 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -2868,7 +2868,7 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 { ); } -pub fn is_libc_lib_name(target: std.Target, name: []const u8) bool { +pub fn isLibCLibName(target: std.Target, name: []const u8) bool { const ignore_case = target.os.tag == .macos or target.os.tag == .windows; if (eqlIgnoreCase(ignore_case, name, "c")) @@ -2987,7 +2987,7 @@ pub fn is_libc_lib_name(target: std.Target, name: []const u8) bool { return false; } -pub fn is_libcpp_lib_name(target: std.Target, name: []const u8) bool { +pub fn isLibCxxLibName(target: std.Target, name: []const u8) bool { const ignore_case = target.os.tag.isDarwin() or target.os.tag == .windows; return eqlIgnoreCase(ignore_case, name, "c++") or diff --git a/src/Sema.zig b/src/Sema.zig index 0341c3a8d8..f18648a27b 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -9606,7 +9606,7 @@ fn handleExternLibName( const comp = zcu.comp; const target = zcu.getTarget(); log.debug("extern fn symbol expected in lib '{s}'", .{lib_name}); - if (target.is_libc_lib_name(lib_name)) { + if (target.isLibCLibName(lib_name)) { if (!comp.config.link_libc) { return sema.fail( block, @@ -9617,7 +9617,7 @@ fn handleExternLibName( } break :blk; } - if (target.is_libcpp_lib_name(lib_name)) { + if (target.isLibCxxLibName(lib_name)) { if (!comp.config.link_libcpp) return sema.fail( block, src_loc, diff --git a/src/main.zig b/src/main.zig index 75a273b560..05e7c01229 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3765,11 +3765,11 @@ fn createModule( info: SystemLib, }) = .{}; for (create_module.system_libs.keys(), create_module.system_libs.values()) |lib_name, info| { - if (target.is_libc_lib_name(lib_name)) { + if (target.isLibCLibName(lib_name)) { create_module.opts.link_libc = true; continue; } - if (target.is_libcpp_lib_name(lib_name)) { + if (target.isLibCxxLibName(lib_name)) { create_module.opts.link_libcpp = true; continue; }