aboutsummaryrefslogtreecommitdiff
path: root/src/link.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-11-13 22:26:31 -0500
committerAndrew Kelley <superjoe30@gmail.com>2017-11-13 22:26:31 -0500
commitdf07361642e8c7596b27a1291f99fd2deae48a9a (patch)
treea494a4ba9498e9f4b64acaf227cbb76d9d413319 /src/link.cpp
parent57cd074959cd529f0648264e877f9819f0209ddf (diff)
parent98e3c7911cbbd6dc0d0e45775e424e448b8c651a (diff)
downloadzig-df07361642e8c7596b27a1291f99fd2deae48a9a.tar.gz
zig-df07361642e8c7596b27a1291f99fd2deae48a9a.zip
Merge branch 'parsec' of https://github.com/dimenus/zig into dimenus-parsec
Diffstat (limited to 'src/link.cpp')
-rw-r--r--src/link.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/link.cpp b/src/link.cpp
index 1a166a444f..bc84b27b89 100644
--- a/src/link.cpp
+++ b/src/link.cpp
@@ -485,8 +485,13 @@ static void construct_linker_job_coff(LinkJob *lj) {
continue;
}
if (link_lib->provided_explicitly) {
- Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
- lj->args.append(buf_ptr(arg));
+ if (lj->codegen->zig_target.env_type == ZigLLVM_GNU) {
+ Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
+ lj->args.append(buf_ptr(arg));
+ }
+ else {
+ lj->args.append(buf_ptr(link_lib->name));
+ }
} else {
buf_resize(def_contents, 0);
buf_appendf(def_contents, "LIBRARY %s\nEXPORTS\n", buf_ptr(link_lib->name));