Skip to content

These changes get things working if you link zig using the version of llvm ar that comes from brew - but it breaks for the zig distributed binaries #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moosichu merged 1 commit into from
Feb 21, 2023
+2 −3
Merged

These changes get things working if you link zig using the version of llvm ar that comes from brew - but it breaks for the zig distributed binaries #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/archive/Archive.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ pub fn getDefaultArchiveTypeFromHost() ArchiveType {
// inferred up to this point.
// TODO: Figure out why this is needed to pass tests on macOS as this seems
// to contradict docs/code?
if (builtin.os.tag.isDarwin()) return .darwin;
return .gnu;
// if (builtin.os.tag.isDarwin()) return .darwin;
// switch (builtin.os.tag) {
// .windows => return .coff,
// else => return .gnu,
Expand Down Expand Up @@ -614,8 +614,7 @@ pub fn finalize(self: *Archive, allocator: Allocator) (FinalizeError || HandledI
// BSD format: Write the symbol table
// In darwin if symbol table writing is enabled the expected behaviour
// is that we write an empty symbol table!
const write_symbol_table =
self.modifiers.build_symbol_table and (self.symbols.items.len != 0 or self.output_archive_type != .bsd);
const write_symbol_table = self.modifiers.build_symbol_table;
if (write_symbol_table) {
const tracy_scope = traceNamed(@src(), "Write Symbol Table");
defer tracy_scope.end();
Expand Down
Loading