Skip to content

Commit

Permalink
openssl/3.x.x: port conan-io#6337 OpenSSL on Windows: multi-profile s…
Browse files Browse the repository at this point in the history
…upport

Co-Authored-By: Stefan Floeren <stefan-floeren@users.noreply.github.com>
  • Loading branch information
Croydon and stefan-floeren committed Sep 9, 2021
1 parent ded7d4f commit 2a989ed
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion recipes/openssl/3.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2a989ed

Please sign in to comment.