crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix c++, check pkg-config exists before calling PkgConfigUtil

Browse Source
This commit is contained in:
crazywhalecc 2025-07-22 22:46:13 +08:00
parent dea3c4afeb
commit 099425abc8
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,9 @@ class SPCConfigUtil
if (SPCTarget::getTargetOS() === 'Darwin') { if (SPCTarget::getTargetOS() === 'Darwin') {
$libs .= " {$this->getFrameworksString($extensions)}"; $libs .= " {$this->getFrameworksString($extensions)}";
} }
$libs .= $this->builder->hasCpp() && $this->builder instanceof MacOSBuilder ? ' -lc++' : ' -lstdc++'; if ($this->builder->hasCpp()) {
$libs .= $this->builder instanceof MacOSBuilder ? ' -lc++' : ' -lstdc++';
}
if ($this->libs_only_deps) { if ($this->libs_only_deps) {
return [ return [
'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags), 'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags),
@ -130,7 +131,13 @@ class SPCConfigUtil
// parse pkg-configs // parse pkg-configs
foreach ($libraries as $library) { foreach ($libraries as $library) {
$pc_cflags = implode(' ', Config::getLib($library, 'pkg-configs', [])); $pc = Config::getLib($library, 'pkg-configs', []);
foreach ($pc as $file) {
if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$file}.pc")) {
throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
}
}
$pc_cflags = implode(' ', $pc);
if ($pc_cflags !== '') { if ($pc_cflags !== '') {
$pc_cflags = PkgConfigUtil::getCflags($pc_cflags); $pc_cflags = PkgConfigUtil::getCflags($pc_cflags);
$includes[] = $pc_cflags; $includes[] = $pc_cflags;