aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2023-08-20 10:43:20 +0200
committerJakub Konka <kubkon@jakubkonka.com>2023-08-20 10:43:20 +0200
commit4793dafa0433d758b126f2f97d1de031b99e0fa1 (patch)
treedb8757b4acee55a28e1d6b5b6616fc2c3626eb7d /src/main.zig
parente687c87d691518d63414aed4f355dabbd8565dc3 (diff)
downloadzig-4793dafa0433d758b126f2f97d1de031b99e0fa1.tar.gz
zig-4793dafa0433d758b126f2f97d1de031b99e0fa1.zip
frontend: move framework path resolution from the linker to frontend
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig102
1 files changed, 99 insertions, 3 deletions
diff --git a/src/main.zig b/src/main.zig
index 01ef0d87be..3d59308ac1 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -746,6 +746,13 @@ const SystemLib = struct {
}
};
+/// Similar to `link.Framework` except it doesn't store yet unresolved
+/// path to the framework.
+const Framework = struct {
+ needed: bool = false,
+ weak: bool = false,
+};
+
const CliModule = struct {
mod: *Package,
/// still in CLI arg format
@@ -919,7 +926,7 @@ fn buildOutputType(
var c_source_files = std.ArrayList(Compilation.CSourceFile).init(arena);
var link_objects = std.ArrayList(Compilation.LinkObject).init(arena);
var framework_dirs = std.ArrayList([]const u8).init(arena);
- var frameworks: std.StringArrayHashMapUnmanaged(Compilation.Framework) = .{};
+ var frameworks: std.StringArrayHashMapUnmanaged(Framework) = .{};
// null means replace with the test executable binary
var test_exec_args = std.ArrayList(?[]const u8).init(arena);
var linker_export_symbol_names = std.ArrayList([]const u8).init(arena);
@@ -2566,7 +2573,7 @@ fn buildOutputType(
want_native_include_dirs = true;
}
- // Resolve the library and framework path arguments with respect to sysroot.
+ // Resolve the library path arguments with respect to sysroot.
var lib_dirs = std.ArrayList([]const u8).init(arena);
if (sysroot) |root| {
for (lib_dir_args.items) |dir| {
@@ -2868,6 +2875,65 @@ fn buildOutputType(
}
// After this point, resolved_system_libs is used instead of external_system_libs.
+ // We now repeat part of the process for frameworks.
+ var resolved_frameworks: std.MultiArrayList(struct {
+ name: []const u8,
+ framework: Compilation.Framework,
+ }) = .{};
+
+ if (frameworks.keys().len > 0) {
+ var test_path = std.ArrayList(u8).init(gpa);
+ defer test_path.deinit();
+
+ var checked_paths = std.ArrayList(u8).init(gpa);
+ defer checked_paths.deinit();
+
+ var failed_frameworks = std.ArrayList(struct {
+ name: []const u8,
+ checked_paths: []const u8,
+ }).init(arena);
+
+ framework: for (frameworks.keys(), frameworks.values()) |framework_name, info| {
+ checked_paths.clearRetainingCapacity();
+
+ for (framework_dirs.items) |framework_dir_path| {
+ if (try accessFrameworkPath(
+ &test_path,
+ &checked_paths,
+ framework_dir_path,
+ framework_name,
+ )) {
+ const path = try arena.dupe(u8, test_path.items);
+ try resolved_frameworks.append(arena, .{
+ .name = framework_name,
+ .framework = .{
+ .needed = info.needed,
+ .weak = info.weak,
+ .path = path,
+ },
+ });
+ continue :framework;
+ }
+ }
+
+ try failed_frameworks.append(.{
+ .name = framework_name,
+ .checked_paths = try arena.dupe(u8, checked_paths.items),
+ });
+ }
+
+ if (failed_frameworks.items.len > 0) {
+ for (failed_frameworks.items) |f| {
+ const searched_paths = if (f.checked_paths.len == 0) " none" else f.checked_paths;
+ std.log.err("unable to find framework '{s}'. searched paths: {s}", .{
+ f.name, searched_paths,
+ });
+ }
+ process.exit(1);
+ }
+ }
+ // After this point, resolved_frameworks is used instead of frameworks.
+
const object_format = target_info.target.ofmt;
if (output_mode == .Obj and (object_format == .coff or object_format == .macho)) {
@@ -3261,7 +3327,8 @@ fn buildOutputType(
.c_source_files = c_source_files.items,
.link_objects = link_objects.items,
.framework_dirs = framework_dirs.items,
- .frameworks = frameworks,
+ .framework_names = resolved_frameworks.items(.name),
+ .framework_infos = resolved_frameworks.items(.framework),
.system_lib_names = resolved_system_libs.items(.name),
.system_lib_infos = resolved_system_libs.items(.lib),
.wasi_emulated_libs = wasi_emulated_libs.items,
@@ -6336,3 +6403,32 @@ fn accessLibPath(
return false;
}
+
+fn accessFrameworkPath(
+ test_path: *std.ArrayList(u8),
+ checked_paths: *std.ArrayList(u8),
+ framework_dir_path: []const u8,
+ framework_name: []const u8,
+) !bool {
+ const sep = fs.path.sep_str;
+
+ for (&[_][]const u8{ "tbd", "dylib" }) |ext| {
+ test_path.clearRetainingCapacity();
+ try test_path.writer().print("{s}" ++ sep ++ "{s}.framework" ++ sep ++ "{s}.{s}", .{
+ framework_dir_path,
+ framework_name,
+ framework_name,
+ ext,
+ });
+ try checked_paths.writer().print("\n {s}", .{test_path.items});
+ fs.cwd().access(test_path.items, .{}) catch |err| switch (err) {
+ error.FileNotFound => continue,
+ else => |e| fatal("unable to search for {s} framework '{s}': {s}", .{
+ ext, test_path.items, @errorName(e),
+ }),
+ };
+ return true;
+ }
+
+ return false;
+}