small adjustments

This commit is contained in:
DubbleClick
2025-07-26 20:12:18 +07:00
parent 630f861c62
commit fb62a0e338
3 changed files with 4 additions and 3 deletions

View File

@@ -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'];

View File

@@ -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;
} }

View File

@@ -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()}",
]); ]);
} }