aboutsummaryrefslogtreecommitdiff
path: root/src/link.zig
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2021-11-26 10:45:16 +0100
committerJakub Konka <kubkon@jakubkonka.com>2021-11-26 10:45:16 +0100
commita96b6ad83f4385dd47112084baeeb24e7e9356fa (patch)
tree1f40a6f9ac16b174f17501f3d41e082ff302c17c /src/link.zig
parentda7baf7daec175f63e336082d4bcada9ccf4d55c (diff)
parenta53becc034fc9447843286d140780e25d29c07d4 (diff)
downloadzig-a96b6ad83f4385dd47112084baeeb24e7e9356fa.tar.gz
zig-a96b6ad83f4385dd47112084baeeb24e7e9356fa.zip
Merge branch 'build-obj-no-link' of git://github.com/mattnite/zig into mattnite-build-obj-no-link
Diffstat (limited to 'src/link.zig')
-rw-r--r--src/link.zig4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/link.zig b/src/link.zig
index f4c51c735f..d045095e01 100644
--- a/src/link.zig
+++ b/src/link.zig
@@ -531,6 +531,10 @@ pub const File = struct {
try fs.cwd().copyFile(cached_pp_file_path, fs.cwd(), full_out_path, .{});
return;
}
+
+ if (base.options.output_mode == .Obj)
+ return;
+
const use_lld = build_options.have_llvm and base.options.use_lld;
if (use_lld and base.options.output_mode == .Lib and base.options.link_mode == .Static) {
return base.linkAsArchive(comp);