Merge branch 'main' into feat/xdebug-dynamic

This commit is contained in:
Marc
2025-03-23 10:13:56 +01:00
committed by GitHub
12 changed files with 133 additions and 22 deletions

View File

@@ -42,6 +42,10 @@ class SPCConfigUtil
if ($this->builder->hasCpp()) {
$libs .= $this->builder instanceof MacOSBuilder ? ' -lc++' : ' -lstdc++';
}
// mimalloc must come first
if (str_contains($libs, BUILD_LIB_PATH . '/mimalloc.o')) {
$libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace(BUILD_LIB_PATH . '/mimalloc.o', '', $libs);
}
return [
'cflags' => $cflags,
'ldflags' => $ldflags,