mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-09 09:55:37 +08:00
revert
This commit is contained in:
@@ -304,9 +304,11 @@ class PackageInstaller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get resolved package names whose build artifacts contribute to the PHP main link.
|
* Get resolved package names filtered to only packages whose build artifacts are available.
|
||||||
* Excludes libraries not yet built (so SPCConfigUtil doesn't probe their .a files) and
|
* This excludes library packages that haven't been built/installed yet, which naturally
|
||||||
* shared-only extensions (they link separately into their own .so).
|
* prevents SPCConfigUtil from checking static-lib files of libraries that come after
|
||||||
|
* the current target in the build order (e.g. 'watcher' for frankenphp isn't built
|
||||||
|
* when 'php' is being compiled).
|
||||||
*
|
*
|
||||||
* @return string[] Available resolved package names
|
* @return string[] Available resolved package names
|
||||||
*/
|
*/
|
||||||
@@ -316,12 +318,12 @@ class PackageInstaller
|
|||||||
array_keys($this->packages),
|
array_keys($this->packages),
|
||||||
function (string $name): bool {
|
function (string $name): bool {
|
||||||
$pkg = $this->packages[$name] ?? null;
|
$pkg = $this->packages[$name] ?? null;
|
||||||
|
// Exclude library packages whose build artifacts don't exist yet.
|
||||||
|
// Extensions and targets are not filtered — extensions are compiled into PHP
|
||||||
|
// and don't have standalone build artifacts.
|
||||||
if ($pkg instanceof LibraryPackage && $pkg->getType() === 'library' && !$pkg->isInstalled()) {
|
if ($pkg instanceof LibraryPackage && $pkg->getType() === 'library' && !$pkg->isInstalled()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ($pkg instanceof PhpExtensionPackage && $pkg->isBuildShared() && !$pkg->isBuildStatic()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
));
|
));
|
||||||
|
|||||||
Reference in New Issue
Block a user