From 2ac20cf3afb1b43bd2ab1c384fa508d48df8be80 Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Sat, 5 Jul 2025 10:44:32 +0700
Subject: [PATCH] remove unnecessary LDFLAGS_PROGRAM env var

---
 bin/spc-gnu-docker                     | 1 -
 config/env.ini                         | 2 --
 src/SPC/builder/linux/LinuxBuilder.php | 2 +-
 src/SPC/doctor/item/ZigCheck.php       | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/spc-gnu-docker b/bin/spc-gnu-docker
index 2b4f826e..f619a82b 100755
--- a/bin/spc-gnu-docker
+++ b/bin/spc-gnu-docker
@@ -155,7 +155,6 @@ fi
 # Apply env in temp env file
 echo 'SPC_DEFAULT_C_FLAGS=-fPIC' > /tmp/spc-gnu-docker.env
 echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
-echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
 
 # Environment variable passthrough
 ENV_LIST=""
diff --git a/config/env.ini b/config/env.ini
index fa5f3030..74f4322c 100644
--- a/config/env.ini
+++ b/config/env.ini
@@ -119,8 +119,6 @@ SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
-; EXTRA_LDFLAGS_PROGRAM for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -pie"
 
 [macos]
 ; build target: macho or macho (possibly we could support macho-universal in the future)
diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php
index 72186949..258365d1 100644
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -331,7 +331,7 @@ class LinuxBuilder extends UnixBuilderBase
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LIBS' => getenv('SPC_EXTRA_LIBS') . ' ' . SPCTarget::getRuntimeLibs(),
             'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'),
+            'EXTRA_LDFLAGS_PROGRAM' => SPCTarget::isStatic() ? '-all-static -pie' : '-pie',
         ];
     }
 
diff --git a/src/SPC/doctor/item/ZigCheck.php b/src/SPC/doctor/item/ZigCheck.php
index ffd9aca5..186f43b7 100644
--- a/src/SPC/doctor/item/ZigCheck.php
+++ b/src/SPC/doctor/item/ZigCheck.php
@@ -38,7 +38,7 @@ class ZigCheck
      * @throws WrongUsageException
      */
     #[AsFixItem('install-zig')]
-    public function fixMuslCrossMake(): bool
+    public function installZig(): bool
     {
         $arch = arch2gnu(php_uname('m'));
         $os = match (PHP_OS_FAMILY) {