From a5a020eef1a220e865cd98e51ee0f1980b5a7f38 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Wed, 2 Jul 2025 12:56:11 +0700 Subject: [PATCH] Revert "add cache file option to autoconf executor by default (if cflags and ldflags match default)" This reverts commit abe27598deb861be96e4a85c27a0b439f72d4d85. --- src/SPC/util/UnixShell.php | 10 +++++----- src/SPC/util/executor/UnixAutoconfExecutor.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php index 95f23810..16b079e5 100644 --- a/src/SPC/util/UnixShell.php +++ b/src/SPC/util/UnixShell.php @@ -117,11 +117,6 @@ class UnixShell return trim($str); } - public function getEnv(): array - { - return $this->env; - } - private function getExecString(string $cmd): string { logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']); @@ -134,4 +129,9 @@ class UnixShell } return $cmd; } + + public function getEnv(): array + { + return $this->env; + } } diff --git a/src/SPC/util/executor/UnixAutoconfExecutor.php b/src/SPC/util/executor/UnixAutoconfExecutor.php index 1c9f496e..d0e24a0a 100644 --- a/src/SPC/util/executor/UnixAutoconfExecutor.php +++ b/src/SPC/util/executor/UnixAutoconfExecutor.php @@ -46,7 +46,7 @@ class UnixAutoconfExecutor extends Executor /** * Run make * - * @param string $target Build target + * @param string $target Build target * @throws RuntimeException */ public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = []): static @@ -72,9 +72,9 @@ class UnixAutoconfExecutor extends Executor * Add optional library configuration. * This method checks if a library is available and adds the corresponding arguments to the CMake configuration. * - * @param string $name library name to check - * @param \Closure|string $true_args arguments to use if the library is available (allow closure, returns string) - * @param string $false_args arguments to use if the library is not available + * @param string $name library name to check + * @param \Closure|string $true_args arguments to use if the library is available (allow closure, returns string) + * @param string $false_args arguments to use if the library is not available * @return $this */ public function optionalLib(string $name, \Closure|string $true_args, string $false_args = ''): static