From 8fc794a6e1f597f6c1a5a3a173c1851aa391d809 Mon Sep 17 00:00:00 2001 From: Russ Webber Date: Mon, 5 Dec 2022 13:20:09 +1100 Subject: [PATCH] fix: find the libcxx lib directory in 5.1.0 --- .../data/packages/toolchain-wrapper/conanfile.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/conan_ue4cli/data/packages/toolchain-wrapper/conanfile.py b/conan_ue4cli/data/packages/toolchain-wrapper/conanfile.py index 2c64210..5838afe 100644 --- a/conan_ue4cli/data/packages/toolchain-wrapper/conanfile.py +++ b/conan_ue4cli/data/packages/toolchain-wrapper/conanfile.py @@ -35,11 +35,16 @@ def _find_libcxx(self, root, architecture): ''' Attempts to locate the libc++ static library for the specified architecture under the supplied root directory ''' + libraries = glob.glob(join(root, "lib", "Linux", "*{}*".format(architecture), "libc++.a")) if len(libraries) > 0: return libraries[0] - else: - raise RuntimeError('Failed to locate libc++.a for architecture "{}" inside directory "{}"!'.format(architecture, root)) + + libraries = glob.glob(join(root, "lib", "Unix", "*{}*".format(architecture), "libc++.a")) + if len(libraries) > 0: + return libraries[0] + + raise RuntimeError('Failed to locate libc++.a for architecture "{}" inside directory "{}"!'.format(architecture, root)) def package(self):