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

also use libstdc++.a for grpc?

Browse Source
This commit is contained in:
henderkes 2025-09-18 21:29:46 +02:00
parent 83696e92b7
commit 81430e6853
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SPC/builder/Extension.php
View File

@ -222,7 +222,8 @@ class Extension
{ {
$config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs())); $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
[$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']); [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
$lstdcpp = str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : ''; $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
$lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
$makefileContent = file_get_contents($this->source_dir . '/Makefile'); $makefileContent = file_get_contents($this->source_dir . '/Makefile');
if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) { if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {

12
src/SPC/builder/extension/grpc.php
View File

@ -60,7 +60,17 @@ class grpc extends Extension
protected function getSharedExtensionEnv(): array protected function getSharedExtensionEnv(): array
{ {
$env = parent::getSharedExtensionEnv(); $env = parent::getSharedExtensionEnv();
$env['CPPFLAGS'] = $env['CXXFLAGS']; $env['CPPFLAGS'] = $env['CXXFLAGS'] . ' -Wno-attributes';
return $env; return $env;
} }
protected function splitLibsIntoStaticAndShared(string $allLibs): array
{
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
$static .= ' -l:libstdc++.a';
$shared = str_replace('-lstdc++', '', $shared);
}
return [clean_spaces($static), clean_spaces($shared)];
}
} }