authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-12-12 13:31:26+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-12-12 13:31:26+01:00
log1abae064325112895de8324bf230c7cb5cdb2711
treeecd70ecf8ca934f4f9e1bea340f47aa70a8f632b
parentdbfcebf8d88b91c5a85366da09a4ce69c0bb5dc6
parent82a706934452560e5848527207c6cb476e1f1444

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


1 files changed, 7 insertions(+), 9 deletions(-)

src/link/MachO.zig+7-9
......@@ -752,7 +752,6 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
752752 }
753753 }
754754
755 var framework_not_found = false;
756755 for (self.base.options.frameworks) |framework| {
757756 for (&[_][]const u8{ ".tbd", ".dylib", "" }) |ext| {
758757 if (try resolveFramework(arena, framework_dirs.items, framework, ext)) |full_path| {
......@@ -761,14 +760,13 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
761760 }
762761 } else {
763762 log.warn("framework not found for '-framework {s}'", .{framework});
764 framework_not_found = true;
765 }
766 }
767
768 if (framework_not_found) {
769 log.warn("Framework search paths:", .{});
770 for (framework_dirs.items) |dir| {
771 log.warn(" {s}", .{dir});
763 log.warn("Framework search paths:", .{});
764 for (framework_dirs.items) |dir| {
765 log.warn(" {s}", .{dir});
766 } else {
767 log.warn(" <empty>. Consider specifying --sysroot", .{});
768 }
769 return error.FrameworkNotFound;
772770 }
773771 }
774772