Skip to content

Commit 308e7d5

Browse files
committed
fix building static Android executables
1 parent f7bf61a commit 308e7d5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/link.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
16531653
soname = buf_sprintf("lib%s.so.%" ZIG_PRI_usize, buf_ptr(g->root_out_name), g->version_major);
16541654
}
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) {
16571657
lj->args.append("-pie");
16581658
}
16591659

@@ -1821,7 +1821,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
18211821
}
18221822

18231823
// 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) {
18251825
lj->args.append(get_libc_crt_file(g, "crtend_android.o"));
18261826
} else if (lj->link_in_crt && target_libc_needs_crti_crtn(g->zig_target)) {
18271827
lj->args.append(get_libc_crt_file(g, "crtn.o"));

0 commit comments

Comments
 (0)