Skip to content

Commit 85b9f5e

Browse files
committed
Refactor package resolution to filter only available build artifacts
1 parent f8d24e2 commit 85b9f5e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/StaticPHP/Runtime/Executor/UnixCMakeExecutor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private function getDefaultCMakeArgs(): array
233233
if ($this->package instanceof TargetPackage) {
234234
$resolvedNames = array_keys($this->installer->getResolvedPackages());
235235
$resolvedNames[] = $this->package->getName();
236-
$fwFlags = SPCConfigUtil::getFrameworksString($resolvedNames);
236+
$fwFlags = new SPCConfigUtil()->getFrameworksString($resolvedNames);
237237
if ($fwFlags !== '') {
238238
$exeLinkerFlags .= " {$fwFlags}";
239239
}

src/StaticPHP/Util/SPCConfigUtil.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,20 @@ public function configWithResolvedPackages(array $resolved_packages): array
285285
];
286286
}
287287

288+
public function getFrameworksString(array $extensions): string
289+
{
290+
$list = [];
291+
foreach ($extensions as $extension) {
292+
foreach (PackageConfig::get($extension, 'frameworks', []) as $fw) {
293+
$ks = '-framework ' . $fw;
294+
if (!in_array($ks, $list)) {
295+
$list[] = $ks;
296+
}
297+
}
298+
}
299+
return implode(' ', $list);
300+
}
301+
288302
private function hasCpp(array $packages): bool
289303
{
290304
foreach ($packages as $package) {
@@ -492,18 +506,4 @@ private function getFullLibName(string $lib): string
492506
}
493507
return $lib;
494508
}
495-
496-
private function getFrameworksString(array $extensions): string
497-
{
498-
$list = [];
499-
foreach ($extensions as $extension) {
500-
foreach (PackageConfig::get($extension, 'frameworks', []) as $fw) {
501-
$ks = '-framework ' . $fw;
502-
if (!in_array($ks, $list)) {
503-
$list[] = $ks;
504-
}
505-
}
506-
}
507-
return implode(' ', $list);
508-
}
509509
}

0 commit comments

Comments
 (0)