Merge remote-tracking branch 'origin/main' into zig

This commit is contained in:
DubbleClick
2025-07-22 12:49:42 +07:00
19 changed files with 309 additions and 52 deletions

View File

@@ -10,7 +10,6 @@ use SPC\exception\WrongUsageException;
use SPC\store\Config;
use SPC\store\FileSystem;
use SPC\util\SPCConfigUtil;
use SPC\util\SPCTarget;
class Extension
{
@@ -550,6 +549,11 @@ class Extension
$sharedLibString .= '-l' . $lib . ' ';
}
}
// move -lstdc++ to static libraries because centos 7 the shared libstdc++ is incomplete
if (str_contains((string) getenv('PATH'), 'rh/devtoolset-10')) {
$staticLibString .= ' -lstdc++';
$sharedLibString = str_replace('-lstdc++', '', $sharedLibString);
}
return [trim($staticLibString), trim($sharedLibString)];
}