Merge branch 'framework-not-found' of git://github.com/motiejus/zig i…

…nto motiejus-framework-not-found
ziglang · Dec 12, 2021 · 1abae06 · 1abae06
2 parents dbfcebf + 82a7069
commit 1abae06
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
@@ -752,7 +752,6 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
                 }
             }
 
-            var framework_not_found = false;
             for (self.base.options.frameworks) |framework| {
                 for (&[_][]const u8{ ".tbd", ".dylib", "" }) |ext| {
                     if (try resolveFramework(arena, framework_dirs.items, framework, ext)) |full_path| {
@@ -761,14 +760,13 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
                     }
                 } else {
                     log.warn("framework not found for '-framework {s}'", .{framework});
-                    framework_not_found = true;
-                }
-            }
-
-            if (framework_not_found) {
-                log.warn("Framework search paths:", .{});
-                for (framework_dirs.items) |dir| {
-                    log.warn("  {s}", .{dir});
+                    log.warn("Framework search paths:", .{});
+                    for (framework_dirs.items) |dir| {
+                        log.warn("  {s}", .{dir});
+                    } else {
+                        log.warn("  <empty>. Consider specifying --sysroot", .{});
+                    }
+                    return error.FrameworkNotFound;
                 }
             }