authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-11-26 10:45:16+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-11-26 10:45:16+01:00
loga96b6ad83f4385dd47112084baeeb24e7e9356fa
tree1f40a6f9ac16b174f17501f3d41e082ff302c17c
parentda7baf7daec175f63e336082d4bcada9ccf4d55c
parenta53becc034fc9447843286d140780e25d29c07d4

Merge branch 'build-obj-no-link' of git://github.com/mattnite/zig into mattnite-build-obj-no-link

1 files changed, 4 insertions(+), 0 deletions(-)

src/link.zig+4
...@@ -531,6 +531,10 @@ pub const File = struct {...@@ -531,6 +531,10 @@ pub const File = struct {
531 try fs.cwd().copyFile(cached_pp_file_path, fs.cwd(), full_out_path, .{});531 try fs.cwd().copyFile(cached_pp_file_path, fs.cwd(), full_out_path, .{});
532 return;532 return;
533 }533 }
534
535 if (base.options.output_mode == .Obj)
536 return;
537
534 const use_lld = build_options.have_llvm and base.options.use_lld;538 const use_lld = build_options.have_llvm and base.options.use_lld;
535 if (use_lld and base.options.output_mode == .Lib and base.options.link_mode == .Static) {539 if (use_lld and base.options.output_mode == .Lib and base.options.link_mode == .Static) {
536 return base.linkAsArchive(comp);540 return base.linkAsArchive(comp);