From 0967098a0d4af42daacad979dcc3563c92f16358 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Sun, 4 Sep 2022 17:17:08 +0200
Subject: [PATCH] Ship the STL if need be (#9470)

c.f., https://github.com/koreader/koreader-base/pull/1513 for the gory details ;).
---
 Makefile | 5 +++++
 base     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 357bad54f..e346bc8ad 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,11 @@ endif
 ifdef WIN32
 	@echo "[*] Install runtime libraries for win32..."
 	cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll .
+endif
+ifdef SHIP_SHARED_STL
+	@echo "[*] Install C++ runtime..."
+	cp -fL $(SHARED_STL_LIB) $(INSTALL_DIR)/koreader/libs/
+	$(STRIP) --strip-unneeded $(INSTALL_DIR)/koreader/libs/$(notdir $(SHARED_STL_LIB))
 endif
 	@echo "[*] Install plugins"
 	@# TODO: link istead of cp?
diff --git a/base b/base
index 78510e498..e09b79e58 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 78510e49888dbb723e313b79fd99121cd04ab185
+Subproject commit e09b79e581912bb6603de765af263c6a5642103d