From b34a50b38160d8455763773888130ecc4e18042a Mon Sep 17 00:00:00 2001 From: Yang Liu Date: Wed, 4 Sep 2024 20:13:58 +0800 Subject: [X64LIBS] Changed x86/x64 libs install directory to prevent conflicts (#1791) * [X64LIBS] Changed x86/x64 libs install directory to prevent conflicts * Update pressure_vessel --- src/core.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core.c') diff --git a/src/core.c b/src/core.c index 2fda5c2e..188102a1 100644 --- a/src/core.c +++ b/src/core.c @@ -1505,6 +1505,8 @@ void LoadLDPath(box64context_t *context) AddPath("/usr/lib/i386-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/usr/i386-linux-gnu/lib", 0)) AddPath("/usr/i386-linux-gnu/lib", &context->box64_ld_lib, 1); + if(FileExist("/usr/lib/box64-i386-linux-gnu", 0)) + AddPath("/usr/lib/box64-i386-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/data/data/com.termux/files/usr/glibc/lib/i386-linux-gnu", 0)) AddPath("/data/data/com.termux/files/usr/glibc/lib/i386-linux-gnu", &context->box64_ld_lib, 1); #endif @@ -1515,6 +1517,8 @@ void LoadLDPath(box64context_t *context) AddPath("/usr/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/usr/x86_64-linux-gnu/lib", 0)) AddPath("/usr/x86_64-linux-gnu/lib", &context->box64_ld_lib, 1); + if(FileExist("/usr/lib/box64-x86_64-linux-gnu", 0)) + AddPath("/usr/lib/box64-x86_64-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", 0)) AddPath("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); } -- cgit 1.4.1