Skip to content

Commit a5a020e

Browse files
committed
Revert "add cache file option to autoconf executor by default (if cflags and ldflags match default)"
This reverts commit abe2759.
1 parent 6f68d7b commit a5a020e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/SPC/util/UnixShell.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ public function getEnvString(): string
117117
return trim($str);
118118
}
119119

120-
public function getEnv(): array
121-
{
122-
return $this->env;
123-
}
124-
125120
private function getExecString(string $cmd): string
126121
{
127122
logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
@@ -134,4 +129,9 @@ private function getExecString(string $cmd): string
134129
}
135130
return $cmd;
136131
}
132+
133+
public function getEnv(): array
134+
{
135+
return $this->env;
136+
}
137137
}

src/SPC/util/executor/UnixAutoconfExecutor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getConfigureArgsString(): string
4646
/**
4747
* Run make
4848
*
49-
* @param string $target Build target
49+
* @param string $target Build target
5050
* @throws RuntimeException
5151
*/
5252
public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = []): static
@@ -72,9 +72,9 @@ public function exec(string $cmd): static
7272
* Add optional library configuration.
7373
* This method checks if a library is available and adds the corresponding arguments to the CMake configuration.
7474
*
75-
* @param string $name library name to check
76-
* @param \Closure|string $true_args arguments to use if the library is available (allow closure, returns string)
77-
* @param string $false_args arguments to use if the library is not available
75+
* @param string $name library name to check
76+
* @param \Closure|string $true_args arguments to use if the library is available (allow closure, returns string)
77+
* @param string $false_args arguments to use if the library is not available
7878
* @return $this
7979
*/
8080
public function optionalLib(string $name, \Closure|string $true_args, string $false_args = ''): static

0 commit comments

Comments
 (0)