remove unnecessary LDFLAGS_PROGRAM env var

Author: henderkes

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=""

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)

src/SPC/builder/linux/LinuxBuilder.php

@@ -331,7 +331,7 @@ private function getMakeExtraVars(): array
             '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',
         ];
     }
 

src/SPC/doctor/item/ZigCheck.php

@@ -38,7 +38,7 @@ public function checkZig(): CheckResult
      * @throws WrongUsageException
      */
     #[AsFixItem('install-zig')]
-    public function fixMuslCrossMake(): bool
+    public function installZig(): bool
     {
         $arch = arch2gnu(php_uname('m'));
         $os = match (PHP_OS_FAMILY) {