From 2a989ed4f962f938b892ea8627c3c416a52c071e Mon Sep 17 00:00:00 2001 From: Croydon Date: Thu, 9 Sep 2021 20:52:07 +0200 Subject: [PATCH] openssl/3.x.x: port #6337 OpenSSL on Windows: multi-profile support Co-Authored-By: Stefan Floeren --- recipes/openssl/3.x.x/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py index 1f38f9f194c6a..1a2516ab50d6f 100644 --- a/recipes/openssl/3.x.x/conanfile.py +++ b/recipes/openssl/3.x.x/conanfile.py @@ -492,7 +492,10 @@ def _run_make(self, targets=None, makefile=None, parallel=True): def _perl(self): if tools.os_info.is_windows and not self._win_bash: # enforce strawberry perl, otherwise wrong perl could be used (from Git bash, MSYS, etc.) - return os.path.join(self.deps_cpp_info["strawberryperl"].rootpath, "bin", "perl.exe") + if "strawberryperl" in self.deps_cpp_info.deps: + return os.path.join(self.deps_cpp_info["strawberryperl"].rootpath, "bin", "perl.exe") + elif hasattr(self, "user_info_build") and "strawberryperl" in self.user_info_build: + return self.user_info_build["strawberryperl"].perl return "perl" @property