From 10c2fe97b0a425c07b1d6de01710fcdfc930f34f Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Mon, 28 Nov 2022 12:22:45 +0800 Subject: [PATCH] libffi - fix to support updated automake recipe - waiting on #12898 --- recipes/libffi/all/conanfile.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes/libffi/all/conanfile.py b/recipes/libffi/all/conanfile.py index fca2894b5fa7b..f5933cfebfc03 100644 --- a/recipes/libffi/all/conanfile.py +++ b/recipes/libffi/all/conanfile.py @@ -127,15 +127,12 @@ def generate(self): compile_wrapper = unix_path(self, os.path.join(self.source_folder, "msvcc.sh")) if architecture_flag: compile_wrapper = f"{compile_wrapper} {architecture_flag}" - # FIXME: Use the conf once https://github.com/conan-io/conan-center-index/pull/12898 is merged - # env.define("AR", f"{unix_path(self, self.conf.get('tools.automake:ar-lib'))}") [version_major, version_minor, _] = self.dependencies.direct_build['automake'].ref.version.split(".", 2) automake_version = f"{version_major}.{version_minor}" - ar_wrapper = unix_path(self, os.path.join(self.dependencies.direct_build['automake'].cpp_info.resdirs[0], f"automake-{automake_version}", "ar-lib")) env.define("CC", f"{compile_wrapper}") env.define("CXX", f"{compile_wrapper}") env.define("LD", "link -nologo") - env.define("AR", f"{ar_wrapper} \"lib -nologo\"") + env.define("AR", f"{unix_path(self, self.conf.get('user.automake:ar-lib'))}") env.define("NM", "dumpbin -symbols") env.define("OBJDUMP", ":") env.define("RANLIB", ":")