authorgravatar for meme@users.noreply.github.commeme <meme@users.noreply.github.com> 2019-09-27 17:33:07-04:00
committergravatar for meme@users.noreply.github.commeme <meme@users.noreply.github.com> 2019-09-27 17:33:07-04:00
log308e7d531452a06be815218f781ecd40afe451ac
treec607b577e0b771d2583f2cd598826f5e42b97898
parentf7bf61a98349c7d888e8808047912c482a2d2560

fix building static Android executables

1 files changed, 2 insertions(+), 2 deletions(-)

src/link.cpp+2-2
...@@ -1653,7 +1653,7 @@ static void construct_linker_job_elf(LinkJob *lj) {...@@ -1653,7 +1653,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
1653 soname = buf_sprintf("lib%s.so.%" ZIG_PRI_usize, buf_ptr(g->root_out_name), g->version_major);1653 soname = buf_sprintf("lib%s.so.%" ZIG_PRI_usize, buf_ptr(g->root_out_name), g->version_major);
1654 }1654 }
16551655
1656 if (target_requires_pie(g->zig_target) && !is_dyn_lib) {1656 if (target_requires_pie(g->zig_target) && !is_dyn_lib && g->libc != nullptr) {
1657 lj->args.append("-pie");1657 lj->args.append("-pie");
1658 }1658 }
16591659
...@@ -1821,7 +1821,7 @@ static void construct_linker_job_elf(LinkJob *lj) {...@@ -1821,7 +1821,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
1821 }1821 }
18221822
1823 // crt end1823 // crt end
1824 if (target_is_android(g->zig_target) && g->have_dynamic_link) {1824 if (target_is_android(g->zig_target) && g->libc != nullptr) {
1825 lj->args.append(get_libc_crt_file(g, "crtend_android.o"));1825 lj->args.append(get_libc_crt_file(g, "crtend_android.o"));
1826 } else if (lj->link_in_crt && target_libc_needs_crti_crtn(g->zig_target)) {1826 } else if (lj->link_in_crt && target_libc_needs_crti_crtn(g->zig_target)) {
1827 lj->args.append(get_libc_crt_file(g, "crtn.o"));1827 lj->args.append(get_libc_crt_file(g, "crtn.o"));