mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-03 03:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add linkLibCpp helper to LibExeObjStep

Browse Source
This commit is contained in:
Tom Maenan Read Cutting 2021-06-02 09:09:50 +01:00 committed by Veikka Tuominen
parent ec4e67fb0e
commit c822a0b59f
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/build.zig
View File

@ -1275,6 +1275,15 @@ fn isLibCLibrary(name: []const u8) bool {
return false;
}
fn isLibCppLibrary(name: []const u8) bool {
const libcpp_libraries = [_][]const u8{ "c++", "stdc++" };
for (libcpp_libraries) |libcpp_lib_name| {
if (mem.eql(u8, name, libcpp_lib_name))
return true;
}
return false;
}
pub const FileSource = union(enum) {
/// Relative to build root
path: []const u8,
@ -1381,6 +1390,7 @@ pub const LibExeObjStep = struct {
c_macros: ArrayList([]const u8),
output_dir: ?[]const u8,
is_linking_libc: bool = false,
is_linking_libcpp: bool = false,
vcpkg_bin_path: ?[]const u8 = null,
/// This may be set in order to override the default install directory
@ -1661,6 +1671,9 @@ pub const LibExeObjStep = struct {
if (isLibCLibrary(name)) {
return self.is_linking_libc;
}
if (isLibCppLibrary(name)) {
return self.is_linking_libcpp;
}
for (self.link_objects.items) |link_object| {
switch (link_object) {
LinkObject.SystemLib => |n| if (mem.eql(u8, n, name)) return true,
@ -1692,6 +1705,13 @@ pub const LibExeObjStep = struct {
}
}
pub fn linkLibCpp(self: *LibExeObjStep) void {
if (!self.is_linking_libcpp) {
self.is_linking_libcpp = true;
self.link_objects.append(LinkObject{ .SystemLib = "c++" }) catch unreachable;
}
}
/// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1.
pub fn defineCMacro(self: *LibExeObjStep, name_and_value: []const u8) void {
self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable;
@ -1798,6 +1818,10 @@ pub const LibExeObjStep = struct {
self.linkLibC();
return;
}
if (isLibCppLibrary(name)) {
self.linkLibCpp();
return;
}
if (self.linkSystemLibraryPkgConfigOnly(name)) |_| {
// pkg-config worked, so nothing further needed to do.
return;