diff --git a/config/env.ini b/config/env.ini index 19ade5c1..acad2523 100644 --- a/config/env.ini +++ b/config/env.ini @@ -104,7 +104,7 @@ LD=${SPC_DEFAULT_LD} ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections" SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}" -SPC_DEFAULT_LD_FLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections" +SPC_DEFAULT_LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections" ; upx executable path UPX_EXEC=${PKG_ROOT_PATH}/bin/upx ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches @@ -144,7 +144,7 @@ LD=${SPC_DEFAULT_LD} ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-plt -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections" SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}" -SPC_DEFAULT_LD_FLAGS="-Wl,-dead_strip" +SPC_DEFAULT_LDFLAGS="-Wl,-dead_strip" ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches SPC_MICRO_PATCHES=cli_checks,macos_iconv diff --git a/src/Package/Library/imagemagick.php b/src/Package/Library/imagemagick.php index 941f1580..fd5de9ed 100644 --- a/src/Package/Library/imagemagick.php +++ b/src/Package/Library/imagemagick.php @@ -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', diff --git a/src/StaticPHP/Package/LibraryPackage.php b/src/StaticPHP/Package/LibraryPackage.php index 5d501299..42f60d79 100644 --- a/src/StaticPHP/Package/LibraryPackage.php +++ b/src/StaticPHP/Package/LibraryPackage.php @@ -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);