zig

commit 0c556095f40bfd935bf1c1c8a638b7bc8dfcfb8a (tree)
parent 308e7d531452a06be815218f781ecd40afe451ac
Author: meme <meme@users.noreply.github.com>
Date:   Sat, 28 Sep 2019 12:48:13 -0400

do not link against gcc runtime on Android target

Diffstat:
M
src/link.cpp
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/link.cpp b/src/link.cpp
@@ -1777,24 +1777,24 @@ static void construct_linker_job_elf(LinkJob *lj) {
         if (g->libc != nullptr) {
             if (!g->have_dynamic_link) {
                 lj->args.append("--start-group");
-                lj->args.append("-lgcc");
                 if (!target_is_android(g->zig_target)) {
+                    lj->args.append("-lgcc");
                     lj->args.append("-lgcc_eh");
                 }
                 lj->args.append("-lc");
                 lj->args.append("-lm");
                 lj->args.append("--end-group");
             } else {
-                lj->args.append("-lgcc");
                 if (!target_is_android(g->zig_target)) {
+                    lj->args.append("-lgcc");
                     lj->args.append("--as-needed");
                     lj->args.append("-lgcc_s");
                     lj->args.append("--no-as-needed");
                 }
                 lj->args.append("-lc");
                 lj->args.append("-lm");
-                lj->args.append("-lgcc");
                 if (!target_is_android(g->zig_target)) {
+                    lj->args.append("-lgcc");
                     lj->args.append("--as-needed");
                     lj->args.append("-lgcc_s");
                     lj->args.append("--no-as-needed");