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

fix smth

Browse Source
This commit is contained in:
henderkes
2026-07-21 10:17:30 +07:00
parent 6060a6c8fa
commit 404b2dca24
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StaticPHP/Package/PhpExtensionPackage.php
View File

@@ -275,7 +275,7 @@ class PhpExtensionPackage extends Package
$compiler_extra = trim($compiler_extra . ' -lcompiler_rt'); $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}"); GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
} }
$config = (new SPCConfigUtil())->getExtensionConfig($this); $config = new SPCConfigUtil(['no_php' => true])->getExtensionConfig($this);
[$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']); [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
$preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group '; $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
$postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group '; $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';

19
src/StaticPHP/Runtime/Executor/UnixCMakeExecutor.php
View File

@@ -228,8 +228,15 @@ class UnixCMakeExecutor extends Executor
"-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}", "-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}",
]; ];
// EXE linker flags: base system libs + framework flags for target packages // EXE linker flags: framework flags for target packages (Darwin). On Linux the
$exeLinkerFlags = SystemTarget::getRuntimeLibs(); // runtime libs (-ldl & co.) are NOT passed here: CMake puts EXE_LINKER_FLAGS before
// the objects/archives, where -Wl,--as-needed (Debian gcc default, and our own
// LDFLAGS) discards them and breaks try_compile probes linking static archives that
// need them (curl's SSL_set_quic_tls_cbs check vs libcrypto.a needing dlopen on
// glibc < 2.34). They go into the toolchain file as CMAKE_<LANG>_STANDARD_LIBRARIES
// instead, which cmake appends AFTER the objects — correct order, as-needed intact,
// and the toolchain file is re-evaluated inside every try_compile.
$exeLinkerFlags = SystemTarget::getTargetOS() === 'Linux' ? '' : SystemTarget::getRuntimeLibs();
if ($this->package instanceof TargetPackage && SystemTarget::getTargetOS() === 'Darwin') { if ($this->package instanceof TargetPackage && SystemTarget::getTargetOS() === 'Darwin') {
$resolvedNames = array_keys($this->installer->getResolvedPackages()); $resolvedNames = array_keys($this->installer->getResolvedPackages());
$resolvedNames[] = $this->package->getName(); $resolvedNames[] = $this->package->getName();
@@ -308,6 +315,14 @@ CMAKE;
$ranlib = getenv('SPC_DEFAULT_RANLIB') ?: (getenv('RANLIB') ?: 'ranlib'); $ranlib = getenv('SPC_DEFAULT_RANLIB') ?: (getenv('RANLIB') ?: 'ranlib');
$toolchain .= "\nSET(CMAKE_AR \"{$ar}\")"; $toolchain .= "\nSET(CMAKE_AR \"{$ar}\")";
$toolchain .= "\nSET(CMAKE_RANLIB \"{$ranlib}\")"; $toolchain .= "\nSET(CMAKE_RANLIB \"{$ranlib}\")";
// Runtime libs as standard libraries: appended after objects/archives on every
// link line (incl. try_compile probes), so -Wl,--as-needed keeps the ones that
// are actually referenced.
$runtimeLibs = SystemTarget::getRuntimeLibs();
if ($runtimeLibs !== '') {
$toolchain .= "\nset(CMAKE_C_STANDARD_LIBRARIES_INIT \"{$runtimeLibs}\")";
$toolchain .= "\nset(CMAKE_CXX_STANDARD_LIBRARIES_INIT \"{$runtimeLibs}\")";
}
} }
FileSystem::writeFile(SOURCE_PATH . '/toolchain.cmake', $toolchain); FileSystem::writeFile(SOURCE_PATH . '/toolchain.cmake', $toolchain);
return $created = realpath(SOURCE_PATH . '/toolchain.cmake'); return $created = realpath(SOURCE_PATH . '/toolchain.cmake');