diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-06-18 14:51:23 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-06-18 14:51:23 -0400 |
| commit | c757984879687e465c6470fc1347cf0f14e46dcc (patch) | |
| tree | 9827a65bfcc0041a279d8a75b567cba83f9c5b16 /src/link.cpp | |
| parent | 84a700f97240eb2d4c65554d9be43bae9fa6d4ae (diff) | |
| parent | 1ca90b585692c9611c64412844d2f3a7b3e11340 (diff) | |
| download | zig-c757984879687e465c6470fc1347cf0f14e46dcc.tar.gz zig-c757984879687e465c6470fc1347cf0f14e46dcc.zip | |
Merge remote-tracking branch 'origin/master' into llvm7
Diffstat (limited to 'src/link.cpp')
| -rw-r--r-- | src/link.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/link.cpp b/src/link.cpp index d2925cb5a8..a4631b1daf 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -208,7 +208,7 @@ static Buf *get_dynamic_linker_path(CodeGen *g) { static void construct_linker_job_elf(LinkJob *lj) { CodeGen *g = lj->codegen; - if (lj->link_in_crt) { + if (g->libc_link_lib != nullptr) { find_libc_lib_path(g); } @@ -432,7 +432,7 @@ static bool zig_lld_link(ZigLLVM_ObjectFormatType oformat, const char **args, si static void construct_linker_job_coff(LinkJob *lj) { CodeGen *g = lj->codegen; - if (lj->link_in_crt) { + if (g->libc_link_lib != nullptr) { find_libc_lib_path(g); } |