crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-08 09:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert to double array_reverse, because static libs with dependencies are backwards

Browse Source
This commit is contained in:
DubbleClick
2025-07-23 10:21:36 +07:00
parent f8970a21be
commit f75c58b7d2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SPC/util/SPCConfigUtil.php
View File

@@ -93,7 +93,7 @@ class SPCConfigUtil
return [ return [
'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags), 'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags),
'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags), 'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags),
'libs' => trim(getenv('LIBS') . ' ' . $libs), 'libs' => trim(getenv('LIBS') . ' ' . $libs),
]; ];
} }
@@ -101,11 +101,11 @@ class SPCConfigUtil
if (!$this->no_php) { if (!$this->no_php) {
$libs = "-lphp -lc {$libs}"; $libs = "-lphp -lc {$libs}";
} }
$libs = '-L' . BUILD_LIB_PATH . ' ' . $libs;
// mimalloc must come first // mimalloc must come first
if (str_contains($libs, BUILD_LIB_PATH . '/mimalloc.o')) { if (str_contains($libs, BUILD_LIB_PATH . '/mimalloc.o')) {
$libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace(BUILD_LIB_PATH . '/mimalloc.o', '', $libs); $libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace(BUILD_LIB_PATH . '/mimalloc.o', '', $libs);
} }
$libs = '-L' . BUILD_LIB_PATH . ' ' . $libs;
return [ return [
'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags), 'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags),
'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags), 'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags),
@@ -180,13 +180,13 @@ class SPCConfigUtil
} }
$pkg_configs = implode(' ', $pkg_configs); $pkg_configs = implode(' ', $pkg_configs);
if ($pkg_configs !== '') { if ($pkg_configs !== '') {
$pc_libs = PkgConfigUtil::getLibsArray($pkg_configs); $pc_libs = array_reverse(PkgConfigUtil::getLibsArray($pkg_configs));
$lib_names = [...$lib_names, ...$pc_libs]; $lib_names = [...$lib_names, ...$pc_libs];
} }
} }
// post-process // post-process
$lib_names = array_reverse(array_unique(array_reverse($lib_names))); $lib_names = array_unique(array_reverse(array_filter($lib_names, fn ($x) => $x !== '')));
$frameworks = array_unique($frameworks); $frameworks = array_unique($frameworks);
// process frameworks to short_name // process frameworks to short_name