From dfc58b49fb431d04612f30df0be0a95a0ec33ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= <john.kare.alsaker@gmail.com>
Date: Fri, 12 Aug 2022 22:01:54 +0200
Subject: [PATCH] Link the C++ standard library correctly.

---
 android-activity/build.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android-activity/build.rs b/android-activity/build.rs
index 45ce9f2..c6a5706 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -29,6 +29,10 @@ fn build_glue_for_game_activity() {
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libnative_app_glue.a");
+
+    // We need to link to both c++_static and c++abi for the static C++ library.
+    // Ideally we'd link directly to libc++.a.
+    println!("cargo:rustc-link-lib=c++abi");
 }
 
 fn main() {