diff --git a/src/SPC/util/GlobalEnvManager.php b/src/SPC/util/GlobalEnvManager.php index 073394a7..9f74d2df 100644 --- a/src/SPC/util/GlobalEnvManager.php +++ b/src/SPC/util/GlobalEnvManager.php @@ -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'); } diff --git a/src/SPC/util/PkgConfigUtil.php b/src/SPC/util/PkgConfigUtil.php index 14c2691f..25e0e1f2 100644 --- a/src/SPC/util/PkgConfigUtil.php +++ b/src/SPC/util/PkgConfigUtil.php @@ -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', ];