From 5334727528e5f85111b2810e80dbe8e37f1b421e Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 24 Jun 2025 23:07:17 +0700 Subject: [PATCH] remove -L/usr/lib64 (need to put it in the zig-cc script, stupid to add it in 15 different places instead) --- config/env.ini | 2 +- src/SPC/builder/linux/LinuxBuilder.php | 6 +----- src/SPC/builder/unix/UnixBuilderBase.php | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/env.ini b/config/env.ini index 8c25fe66..90168b0e 100644 --- a/config/env.ini +++ b/config/env.ini @@ -96,7 +96,7 @@ SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE" ; CPPFLAGS for configuring php SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}" ; LDFLAGS for configuring php -SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH} -L/usr/lib64" +SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}" ; LIBS for configuring php SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lrt -lpthread -lm -lresolv -lutil" ; EXTRA_CFLAGS for `make` php diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index a08b86e4..e73cc91d 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -338,16 +338,12 @@ class LinuxBuilder extends UnixBuilderBase private function getMakeExtraVars(): array { - $env = [ + return [ 'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), 'EXTRA_LIBS' => getenv('SPC_EXTRA_LIBS') . ' ' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS'), 'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), 'EXTRA_LDFLAGS_PROGRAM' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'), ]; - if (str_contains(getenv('CC'), 'zig')) { - $env['LDFLAGS'] = getenv('LDFLAGS') . ' -L/usr/lib64'; - } - return $env; } /** diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index d1106894..bd4bee44 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -351,7 +351,7 @@ abstract class UnixBuilderBase extends BuilderBase 'GOPATH' => PKG_ROOT_PATH . '/go', 'CGO_ENABLED' => '1', 'CGO_CFLAGS' => $config['cflags'], - 'CGO_LDFLAGS' => "{$config['ldflags']} {$config['libs']} {$lrt} -L/usr/lib64", + 'CGO_LDFLAGS' => "{$config['ldflags']} {$config['libs']} {$lrt}", 'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' . '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags . '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .