From d114a2d668bcc8a9b3c4ebb508cb49b8f068e508 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 6 Jul 2021 20:26:19 -0400 Subject: [PATCH] Workaround Broken Library Search Path On Some ARM 32-Bit Systems --- VERSION | 2 +- docs/CHANGELOG.md | 3 +++ launcher/src/bootstrap.c | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index eca07e4c1..ac2cdeba0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index fecf64619..0631b7800 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**2.1.3** +* Workaround Broken Library Search Path On Some ARM 32-Bit Systems + **2.1.2** * Fix Library Loading On ARM 32-Bit Systems diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c index 187060d83..3921fe245 100644 --- a/launcher/src/bootstrap.c +++ b/launcher/src/bootstrap.c @@ -143,6 +143,10 @@ void bootstrap(int argc, char *argv[]) { string_append(&new_ld_path, ":%s", value); } } + // Load ARM Libraries +#ifdef __ARM_ARCH + string_append(&new_ld_path, "%s", ":/usr/lib/arm-linux-gnueabihf:/usr/arm-linux-gnueabihf/lib"); +#endif // Add Full Library Search Path { char *value = get_full_library_search_path();