mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-08 09:25:35 +08:00
small adjustments
This commit is contained in:
@@ -15,8 +15,8 @@ class ZigToolchain implements ToolchainInterface
|
|||||||
// Set environment variables for zig toolchain
|
// Set environment variables for zig toolchain
|
||||||
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=zig-cc');
|
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=zig-cc');
|
||||||
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
|
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
|
||||||
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
|
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=zig ar');
|
||||||
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
|
GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=zig-cc');
|
||||||
|
|
||||||
// Generate additional object needed for zig toolchain
|
// Generate additional object needed for zig toolchain
|
||||||
$paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
|
$paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
|
||||||
|
|||||||
@@ -61,9 +61,9 @@ class UnixShell
|
|||||||
{
|
{
|
||||||
$this->setEnv([
|
$this->setEnv([
|
||||||
'CFLAGS' => $library->getLibExtraCFlags(),
|
'CFLAGS' => $library->getLibExtraCFlags(),
|
||||||
|
'CXXFLAGS' => $library->getLibExtraCXXFlags(),
|
||||||
'LDFLAGS' => $library->getLibExtraLdFlags(),
|
'LDFLAGS' => $library->getLibExtraLdFlags(),
|
||||||
'LIBS' => $library->getLibExtraLibs(),
|
'LIBS' => $library->getLibExtraLibs(),
|
||||||
'CXXFLAGS' => $library->getLibExtraCXXFlags(),
|
|
||||||
]);
|
]);
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ class UnixAutoconfExecutor extends Executor
|
|||||||
{
|
{
|
||||||
$this->shell = shell()->cd($this->library->getSourceDir())->initializeEnv($this->library)->appendEnv([
|
$this->shell = shell()->cd($this->library->getSourceDir())->initializeEnv($this->library)->appendEnv([
|
||||||
'CFLAGS' => "-I{$this->library->getIncludeDir()}",
|
'CFLAGS' => "-I{$this->library->getIncludeDir()}",
|
||||||
|
'CXXFLAGS' => "-I{$this->library->getIncludeDir()}",
|
||||||
'LDFLAGS' => "-L{$this->library->getLibDir()}",
|
'LDFLAGS' => "-L{$this->library->getLibDir()}",
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user