SPC_DEFAULT_LD_FLAGS renamed to SPC_DEFAULT_LDFLAGS

This commit is contained in:
crazywhalecc
2026-05-07 14:56:07 +08:00
parent 9e4a622f42
commit e93d103e99
3 changed files with 7 additions and 7 deletions

View File

@@ -19,10 +19,10 @@ class imagemagick
#[BuildFor('Linux')]
public function buildUnix(LibraryPackage $lib, ToolchainInterface $toolchain): void
{
$ldflags = $original_ldflags = getenv('SPC_DEFAULT_LD_FLAGS');
$ldflags = $original_ldflags = getenv('SPC_DEFAULT_LDFLAGS');
if (str_contains($ldflags, '-Wl,--as-needed')) {
$ldflags = str_replace('-Wl,--as-needed', '', $ldflags);
f_putenv("SPC_DEFAULT_LD_FLAGS={$ldflags}");
f_putenv("SPC_DEFAULT_LDFLAGS={$ldflags}");
}
$ac = UnixAutoconfExecutor::create($lib)
@@ -58,7 +58,7 @@ class imagemagick
$ac->configure()->make();
f_putenv("SPC_DEFAULT_LD_FLAGS={$original_ldflags}");
f_putenv("SPC_DEFAULT_LDFLAGS={$original_ldflags}");
$filelist = [
'ImageMagick.pc',

View File

@@ -160,8 +160,8 @@ class LibraryPackage extends Package
// get environment variable
$env = getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: '';
// get default ld flags
$arch_ld_flags = getenv('SPC_DEFAULT_LD_FLAGS') ?: '';
if (!empty(getenv('SPC_DEFAULT_LD_FLAGS')) && !str_contains($env, $arch_ld_flags)) {
$arch_ld_flags = getenv('SPC_DEFAULT_LDFLAGS') ?: '';
if (!empty(getenv('SPC_DEFAULT_LDFLAGS')) && !str_contains($env, $arch_ld_flags)) {
$env .= ' ' . $arch_ld_flags;
}
return trim($env);