mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-19 13:24:51 +08:00
Remove pkgroot-private
This commit is contained in:
parent
4f6e646812
commit
ef709a169b
@ -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');
|
||||
}
|
||||
|
||||
|
||||
@ -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',
|
||||
];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user