crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-05 15:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into sapi/cgi

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
crazywhalecc
2025-09-05 17:15:28 +08:00
parent e2b6f4cedd d82c86cf62
commit fe945ab3ea
11 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPC/builder/unix/UnixBuilderBase.php
View File

@@ -10,8 +10,6 @@ use SPC\exception\SPCInternalException;
use SPC\exception\ValidationException;
use SPC\exception\WrongUsageException;
use SPC\store\Config;
use SPC\store\CurlHook;
use SPC\store\Downloader;
use SPC\store\FileSystem;
use SPC\store\pkg\GoXcaddy;
use SPC\toolchain\GccNativeToolchain;

4
src/SPC/util/GlobalEnvManager.php
View File

@@ -40,10 +40,6 @@ class GlobalEnvManager
if (is_unix()) {
self::addPathIfNotExists(BUILD_BIN_PATH);
self::addPathIfNotExists(PKG_ROOT_PATH . '/bin');
// internally use `WORKING_DIR/pkgroot-private` to avoid volume mount issues in Docker
if (is_dir(WORKING_DIR . '/pkgroot-private/bin')) {
self::addPathIfNotExists(WORKING_DIR . '/pkgroot-private/bin');
}
self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
}

1
src/SPC/util/PkgConfigUtil.php
View File

@@ -23,7 +23,6 @@ class PkgConfigUtil
{
// Find pkg-config executable
$find_list = [
WORKING_DIR . '/pkgroot-private/bin/pkg-config', // used in Docker build, which is installed inside the container to avoid volume mounting issues
PKG_ROOT_PATH . '/bin/pkg-config',
BUILD_BIN_PATH . '/pkg-config',
];