motiejus/zig
1
Fork 0
Code Releases Activity

fix regressions on macos

Browse Source
This commit is contained in:
Andrew Kelley
2019-03-07 13:04:10 -05:00
parent ffaa4f0a87
commit e2ce00f272
5 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/codegen.cpp
View File

@@ -240,10 +240,6 @@ void codegen_set_emit_file_type(CodeGen *g, EmitFileType emit_file_type) {
g->emit_file_type = emit_file_type;
}
void codegen_set_is_static(CodeGen *g, bool is_static) {
g->is_static = is_static;
}
void codegen_set_each_lib_rpath(CodeGen *g, bool each_lib_rpath) {
g->each_lib_rpath = each_lib_rpath;
}
@@ -9265,7 +9261,9 @@ void codegen_build_and_link(CodeGen *g) {
}
}
if (g->emit_file_type == EmitFileTypeBinary && !compilation_is_already_done(g)) {
if (g->emit_file_type == EmitFileTypeBinary &&
(g->link_objects.length > 1 || g->out_type != OutTypeObj))
{
codegen_link(g);
}
}