From 6c59456c02beccebb9fa6157b1f33c0e55220dfa Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Wed, 27 May 2026 22:30:04 -0700 Subject: [PATCH] fix(windows): consolidate to single canonical strawberry-perl path Per review: spc's pkg config, doctor, and MSVCToolchain all use PKG_ROOT_PATH\strawberry-perl. The arch-suffixed strawberry-perl-{arch}-win path was stale and shouldn't be juggled alongside it. Validate against the one canonical pkg-root path, falling back to WindowsUtil::findCommand. --- src/Package/Library/openssl.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Package/Library/openssl.php b/src/Package/Library/openssl.php index 08ff8b02..df51664f 100644 --- a/src/Package/Library/openssl.php +++ b/src/Package/Library/openssl.php @@ -24,13 +24,8 @@ class openssl { if (SystemTarget::getTargetOS() === 'Windows') { global $argv; - $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl-' . arch2gnu(php_uname('m')) . '-win\perl\bin\perl.exe'; - $perl_path_doctor = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe'; - $perl = match (true) { - file_exists($perl_path_native) => $perl_path_native, - file_exists($perl_path_doctor) => $perl_path_doctor, - default => WindowsUtil::findCommand('perl.exe'), - }; + $perl_path = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe'; + $perl = file_exists($perl_path) ? $perl_path : WindowsUtil::findCommand('perl.exe'); if ($perl === null) { throw new EnvironmentException( 'You need to install perl first!',