add libclang.cpu.a

build shared extensions before frankenphp
fix SourcePatcher::patchHardcodedINI method signature
2026-07-04 15:25:41 +08:00 · 2026-06-09 12:27:58 +07:00 · 2026-06-02 04:00:57 +00:00 · 2026-05-30 09:08:49 +07:00 · 2026-05-29 23:15:53 +07:00 · 2026-05-29 22:38:58 +07:00
127 changed files with 2455 additions and 2280 deletions
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -38,9 +38,6 @@ jobs:
          - name: "windows-x64"
            os: "ubuntu-latest"
            filename: "spc-windows-x64.exe"
-    permissions:
-      id-token: write
-      attestations: write
    steps:
      - name: "Checkout"
        uses: "actions/checkout@v5"
@@ -108,12 +105,6 @@ jobs:
            fi
          fi

-      - name: "Generate build provenance attestation"
-        if: github.event_name != 'pull_request'
-        uses: actions/attest-build-provenance@v4
-        with:
-          subject-path: "${{ github.workspace }}/${{ matrix.operating-system.name == 'windows-x64' && 'spc.exe' || 'spc' }}"
-
      - name: "Copy file"
        run: |
          if [ "${{ matrix.operating-system.name }}" != "windows-x64" ]; then
--- a/box.json
+++ b/box.json
@@ -10,6 +10,7 @@
        "config",
        "src",
        "vendor/psr",
+        "vendor/laravel/prompts",
        "vendor/symfony",
        "vendor/php-di",
        "vendor/zhamao"
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,10 @@
        "php": ">=8.4",
        "ext-mbstring": "*",
        "ext-zlib": "*",
+        "laravel/prompts": "~0.1",
        "php-di/php-di": "^7.1",
        "symfony/console": "^5.4 || ^6 || ^7",
+        "symfony/process": "^7.2",
        "symfony/yaml": "^7.2",
        "zhamao/logger": "^1.1.4"
    },
--- a/composer.lock
+++ b/composer.lock
--- a/config/artifact/ncurses.yml
+++ b/config/artifact/ncurses.yml
@@ -3,10 +3,6 @@ ncurses:
    license-files:
      - COPYING
  source:
-    type: filelist
-    url: 'https://ftp.gnu.org/gnu/ncurses/'
-    regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'
-  source-mirror:
    type: filelist
    url: 'https://ftpmirror.gnu.org/gnu/ncurses/'
    regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'
--- a/config/env.ini
+++ b/config/env.ini
@@ -68,8 +68,8 @@ SPC_PRESERVE_LOGS="no"
 [windows]
 ; build target: win7-static
 SPC_TARGET=native-windows
-; MSYS2 root directory (msys64 subfolder), used by the Windows toolchain
-SPC_MSYS2_PATH="${PKG_ROOT_PATH}\msys2-build-essentials\msys64"
+; php-sdk-binary-tools path
+PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
 ; upx executable path
 UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -100,9 +100,10 @@ SPC_TARGET=${GNU_ARCH}-linux-musl
 CC=${SPC_DEFAULT_CC}
 CXX=${SPC_DEFAULT_CXX}
 AR=${SPC_DEFAULT_AR}
+RANLIB=${SPC_DEFAULT_RANLIB}
 LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
+SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections -Wno-unused-command-line-argument"
 SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
 SPC_DEFAULT_LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections"
 ; upx executable path
@@ -125,6 +126,8 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fPIE -fvisibility=hidden -fvisibility-inlines-hidden ${SPC_DEFAULT_CXXFLAGS}"
 ; 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; appended only to SAPI executable links (cli/fpm/cgi/micro/embed). Used by PGO to inject -fprofile-use= without polluting libphp.{a,so}.
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM=""

 ; optional, path to openssl conf. This affects where openssl will look for the default CA.
 ; default on Debian/Alpine: /etc/ssl, default on RHEL: /etc/pki/tls
@@ -140,6 +143,7 @@ SPC_USE_LLVM=system
 CC=${SPC_DEFAULT_CC}
 CXX=${SPC_DEFAULT_CXX}
 AR=${SPC_DEFAULT_AR}
+RANLIB=${SPC_DEFAULT_RANLIB}
 LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
@@ -163,5 +167,7 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -fvis
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fpie -fvisibility=hidden -fvisibility-inlines-hidden -Werror=unknown-warning-option ${SPC_DEFAULT_CXXFLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.dylib
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
+; EXTRA_LDFLAGS_PROGRAM for `make` php; appended only to SAPI executable links (cli/fpm/cgi/micro/embed). Used by PGO to inject -fprofile-use= without polluting libphp.{a,dylib}.
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM=""
 ; minimum compatible macOS version (LLVM vars, availability not guaranteed)
 MACOSX_DEPLOYMENT_TARGET=12.0
--- a/config/pkg/ext/ext-gmssl.yml
+++ b/config/pkg/ext/ext-gmssl.yml
@@ -10,5 +10,3 @@ ext-gmssl:
      license: PHP-3.01
  depends:
    - gmssl
-  php-extension:
-    arg-type: with-path
--- a/config/pkg/ext/ext-zip.yml
+++ b/config/pkg/ext/ext-zip.yml
@@ -10,11 +10,6 @@ ext-zip:
      license: PHP-3.01
  depends:
    - libzip
-  depends@windows:
-    - libzip
-    - zlib
-    - xz
-    - bzip2
  php-extension:
    arg-type: custom
    arg-type@windows: enable
--- a/config/pkg/lib/gettext.yml
+++ b/config/pkg/lib/gettext.yml
@@ -2,10 +2,6 @@ gettext:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gettext/'
-      regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/gettext/'
      regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
--- a/config/pkg/lib/gmp.yml
+++ b/config/pkg/lib/gmp.yml
@@ -2,13 +2,12 @@ gmp:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gmp/'
-      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/gmp/'
      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
+    source-mirror:
+      type: url
+      url: 'https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz'
    metadata:
      license-files: ['@/gmp.txt']
      license: Custom
--- a/config/pkg/lib/idn2.yml
+++ b/config/pkg/lib/idn2.yml
@@ -2,10 +2,6 @@ idn2:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libidn/'
-      regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/libidn/'
      regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
--- a/config/pkg/lib/libiconv.yml
+++ b/config/pkg/lib/libiconv.yml
@@ -2,10 +2,6 @@ libiconv:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libiconv/'
-      regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/libiconv/'
      regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
--- a/config/pkg/lib/libssh2.yml
+++ b/config/pkg/lib/libssh2.yml
@@ -9,10 +9,8 @@ libssh2:
    metadata:
      license-files: [COPYING]
      license: BSD-3-Clause
-  depends@unix:
+  depends:
    - openssl
-  depends@windows:
-    - zlib
  headers:
    - libssh2.h
    - libssh2_publickey.h
--- a/config/pkg/lib/libunistring.yml
+++ b/config/pkg/lib/libunistring.yml
@@ -2,10 +2,6 @@ libunistring:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libunistring/'
-      regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/libunistring/'
      regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
--- a/config/pkg/lib/readline.yml
+++ b/config/pkg/lib/readline.yml
@@ -2,10 +2,6 @@ readline:
  type: library
  artifact:
    source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/readline/'
-      regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
      type: filelist
      url: 'https://ftpmirror.gnu.org/gnu/readline/'
      regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
--- a/config/pkg/target/7za-win.yml
+++ b/config/pkg/target/7za-win.yml
@@ -1,5 +0,0 @@
-7za-win:
-  type: target
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/v3/tools/7zip/7za.exe', extract: '{pkg_root_path}/bin/7za.exe' }
--- a/config/pkg/target/llvm-compiler-rt.yml
+++ b/config/pkg/target/llvm-compiler-rt.yml
@@ -0,0 +1,6 @@
+llvm-compiler-rt:
+  type: target
+  artifact:
+    binary: custom
+  depends:
+    - zig
--- a/config/pkg/target/llvm-tools.yml
+++ b/config/pkg/target/llvm-tools.yml
@@ -0,0 +1,6 @@
+llvm-tools:
+  type: target
+  artifact:
+    binary: custom
+  depends:
+    - zig
--- a/config/pkg/target/msys2-build-essentials.yml
+++ b/config/pkg/target/msys2-build-essentials.yml
@@ -1,8 +0,0 @@
-msys2-build-essentials:
-  type: target
-  artifact:
-    binary: custom
-  env:
-    SPC_MSYS2_PATH: '{pkg_root_path}/msys2-build-essentials/msys64'
-  path@windows:
-    - '{pkg_root_path}/msys2-build-essentials/msys64/usr/bin'
--- a/config/pkg/target/nasm.yml
+++ b/config/pkg/target/nasm.yml
@@ -2,4 +2,4 @@ nasm:
  type: target
  artifact:
    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{pkg_root_path}/bin/nasm.exe', ndisasm.exe: '{pkg_root_path}/bin/ndisasm.exe' } }
+      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{php_sdk_path}/bin/nasm.exe', ndisasm.exe: '{php_sdk_path}/bin/ndisasm.exe' } }
--- a/config/pkg/target/php-sdk-binary-tools.yml
+++ b/config/pkg/target/php-sdk-binary-tools.yml
@@ -0,0 +1,5 @@
+php-sdk-binary-tools:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: git, rev: master, url: 'https://github.com/php/php-sdk-binary-tools.git', extract: '{php_sdk_path}' }
--- a/docs/en/develop/package-model.md
+++ b/docs/en/develop/package-model.md
@@ -229,7 +229,7 @@ The following path placeholders are supported in string values of the `path`, `e
 | `{working_dir}` | Working directory (project root) |
 | `{download_path}` | Download cache directory (`downloads/`) |
 | `{source_path}` | Extracted source directory (`source/`) |
-| `{spc_msys2_path}` | MSYS2 root directory (`msys64/`) — Windows only |
+| `{php_sdk_path}` | Windows PHP SDK directory |

 ## target Package Type

--- a/docs/en/guide/migrate-from-v2.md
+++ b/docs/en/guide/migrate-from-v2.md
@@ -58,13 +58,7 @@ A single-file hook API for lightweight patches may be provided in a future relea

 ### Windows-only: `--with-sdk-binary-dir` and `--vs-ver`

-These options are no longer accepted on the command line. In v3, the `php-sdk-binary-tools` dependency has been completely removed. v3 now manages its own **MSYS2** environment to support autotools-based library builds on Windows. Run `spc doctor --install` to download and configure MSYS2 automatically.
-
-If you need to point to a custom MSYS2 installation, set the `SPC_MSYS2_PATH` environment variable to the `msys64` directory (e.g. `C:\msys64`). Visual Studio is now auto-detected by the toolchain — no manual version flag needed.
-
-::: warning Migrating from v2
-v2 relied on `php-sdk-binary-tools` and required `--with-sdk-binary-dir` and `--vs-ver` on every build invocation. In v3 these options are gone. Remove them from all CI scripts and run `spc doctor --install` once to set up the Windows build environment.
-:::
+These options are no longer accepted on the command line. Instead, set the `PHP_SDK_PATH` environment variable to point to your PHP SDK binary tools directory. The Visual Studio version is now managed by the toolchain configuration.

 ## Renamed / Deprecated Options

--- a/docs/zh/develop/package-model.md
+++ b/docs/zh/develop/package-model.md
@@ -223,7 +223,7 @@ openssl:
 | `{working_dir}` | 工作目录（项目根目录） |
 | `{download_path}` | 下载缓存目录（`downloads/`） |
 | `{source_path}` | 解压源码目录（`source/`） |
-| `{spc_msys2_path}` | MSYS2 根目录（`msys64/`）——仅 Windows |
+| `{php_sdk_path}` | Windows PHP SDK 目录 |

 ## target 包类型

--- a/docs/zh/guide/migrate-from-v2.md
+++ b/docs/zh/guide/migrate-from-v2.md
@@ -58,13 +58,7 @@ curl -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64

 ### Windows 专有：`--with-sdk-binary-dir` 和 `--vs-ver`

-这两个选项已不再被命令行接受。在 v3 中，`php-sdk-binary-tools` 依赖已被完全移除。v3 现在通过管理自己的 **MSYS2** 环境来支持 Windows 上基于 autotools 的库构建。运行 `spc doctor --install` 即可自动下载并配置 MSYS2。
-
-如需指向自定义 MSYS2 安装目录，请设置 `SPC_MSYS2_PATH` 环境变量，值为 `msys64` 目录路径（例如 `C:\msys64`）。Visual Studio 版本现在由工具链自动检测，无需手动指定版本号。
-
-::: warning 从 v2 迁移
-v2 依赖 `php-sdk-binary-tools`，并在每次构建时需要传入 `--with-sdk-binary-dir` 和 `--vs-ver` 参数。在 v3 中这些选项已被移除。请从所有 CI 脚本中删除这些参数，并使用 `spc doctor --install` 一次性完成 Windows 构建环境的配置。
-:::
+这两个选项已不再被命令行接受。请改为设置 `PHP_SDK_PATH` 环境变量，指向你的 PHP SDK binary tools 目录。Visual Studio 版本现在由工具链配置统一管理。

 ## 已重命名 / 已弃用的选项

--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
  reportUnmatchedIgnoredErrors: false
-  level: 5
+  level: 4
  phpVersion: 80400
  paths:
    - ./src/
--- a/src/Package/Artifact/go_xcaddy.php
+++ b/src/Package/Artifact/go_xcaddy.php
@@ -25,7 +25,6 @@ class go_xcaddy
    ])]
    public function downBinary(ArtifactDownloader $downloader): DownloadResult
    {
-        $pkgroot = PKG_ROOT_PATH;
        $name = SystemTarget::getCurrentPlatformString();
        $arch = match (explode('-', $name)[1]) {
            'x86_64' => 'amd64',
@@ -64,7 +63,7 @@ class go_xcaddy
        if ($file_hash !== $hash) {
            throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}");
        }
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: '{pkg_root_path}/go-xcaddy', verified: true, version: $version);
    }

    #[CustomBinaryCheckUpdate('go-xcaddy', [
@@ -109,7 +108,7 @@ class go_xcaddy
            'GOROOT' => "{$target_path}",
            'GOBIN' => "{$target_path}/bin",
            'GOPATH' => "{$target_path}/go",
-        ])->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+        ])->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
        GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
    }
 }
--- a/src/Package/Artifact/llvm_compiler_rt.php
+++ b/src/Package/Artifact/llvm_compiler_rt.php
@@ -0,0 +1,193 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Artifact;
+
+use StaticPHP\Artifact\ArtifactDownloader;
+use StaticPHP\Artifact\Downloader\DownloadResult;
+use StaticPHP\Artifact\Downloader\Type\CheckUpdateResult;
+use StaticPHP\Artifact\Downloader\Type\GitHubTokenSetupTrait;
+use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
+use StaticPHP\Attribute\Artifact\CustomBinary;
+use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
+use StaticPHP\Exception\BuildFailureException;
+use StaticPHP\Exception\DownloaderException;
+use StaticPHP\Runtime\SystemTarget;
+
+/**
+ * Builds the compiler-rt bits zig ships without — libclang_rt.profile.a (PGO instrumentation)
+ * and clang_rt.crtbegin.o/crtend.o (__dso_handle for shared libs). Target-arch specific:
+ * libs land in PKG_ROOT_PATH/zig/lib/{triple}.
+ * Also builds libclang_rt.cpu_model.a (__cpu_model / __cpu_indicator_init, the libgcc-compatible
+ * globals that __builtin_cpu_supports()/__builtin_cpu_init() reference) for arches that have it.
+ */
+class llvm_compiler_rt
+{
+    use GitHubTokenSetupTrait;
+
+    #[CustomBinary('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function downBinary(ArtifactDownloader $downloader): DownloadResult
+    {
+        $llvmVersion = $this->detectZigLlvmVersion()
+            ?? throw new DownloaderException('llvm-compiler-rt: could not detect bundled clang version from zig cc --version');
+        $tarball = "compiler-rt-{$llvmVersion}.src.tar.xz";
+        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
+        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
+        default_shell()->executeCurlDownload($url, $tarballPath, headers: $this->getGitHubTokenHeaders(), retries: $downloader->getRetry());
+        return DownloadResult::archive($tarball, ['url' => $url, 'version' => $llvmVersion], extract: '{source_path}/llvm-compiler-rt', verified: false, version: $llvmVersion);
+    }
+
+    #[CustomBinaryCheckUpdate('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function checkUpdateBinary(?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
+    {
+        $llvmVersion = $this->detectZigLlvmVersion()
+            ?? throw new DownloaderException('llvm-compiler-rt: could not detect bundled clang version from zig cc --version');
+        return new CheckUpdateResult(
+            old: $old_version,
+            new: $llvmVersion,
+            needUpdate: $old_version === null || $llvmVersion !== $old_version,
+        );
+    }
+
+    #[AfterBinaryExtract('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function postExtract(string $target_path): void
+    {
+        $this->buildForTriple($target_path);
+    }
+
+    public function buildForTriple(?string $sourceDir = null, ?string $triple = null): void
+    {
+        $sourceDir ??= SOURCE_PATH . '/llvm-compiler-rt';
+        $triple ??= SystemTarget::getCanonicalTriple();
+        $libDir = zig::path() . '/lib/' . $triple;
+        if ($this->isBuilt($libDir)) {
+            return;
+        }
+        if (!is_dir($sourceDir) || !is_dir("{$sourceDir}/lib/profile")) {
+            throw new BuildFailureException("llvm-compiler-rt: missing source at {$sourceDir} (extraction layout changed?)");
+        }
+        f_mkdir($libDir, recursive: true);
+        $profileLib = "{$libDir}/libclang_rt.profile.a";
+        $crtBegin = "{$libDir}/clang_rt.crtbegin.o";
+        $crtEnd = "{$libDir}/clang_rt.crtend.o";
+        if (!file_exists($profileLib)) {
+            $this->buildProfileRuntime($sourceDir, $profileLib, $triple);
+        }
+        if (!file_exists($crtBegin) || !file_exists($crtEnd)) {
+            $this->buildCrtObjects($sourceDir, $crtBegin, $crtEnd, $triple);
+        }
+        $cpuModelLib = "{$libDir}/libclang_rt.cpu_model.a";
+        if (self::cpuModelArch($triple) !== null && !file_exists($cpuModelLib)) {
+            $this->buildCpuModelBuiltins($sourceDir, $cpuModelLib, $triple);
+        }
+    }
+
+    public function isBuilt(string $libDir): bool
+    {
+        return file_exists("{$libDir}/libclang_rt.profile.a")
+            && file_exists("{$libDir}/clang_rt.crtbegin.o")
+            && file_exists("{$libDir}/clang_rt.crtend.o")
+            && (self::cpuModelArch(basename($libDir)) === null || file_exists("{$libDir}/libclang_rt.cpu_model.a"));
+    }
+
+    private function detectZigLlvmVersion(): ?string
+    {
+        if (!zig::isInstalled()) {
+            return null;
+        }
+        [$rc, $out] = shell()->execWithResult(escapeshellarg(zig::binary()) . ' cc --version', false);
+        if ($rc !== 0) {
+            return null;
+        }
+        return preg_match('/clang version (\d+\.\d+\.\d+)/', implode("\n", $out), $m) ? $m[1] : null;
+    }
+
+    private function buildProfileRuntime(string $srcRoot, string $libPath, string $triple): void
+    {
+        $profileSrc = "{$srcRoot}/lib/profile";
+        $profileInc = "{$srcRoot}/include";
+        // Skip OS-specific sources we can't satisfy without their SDKs.
+        $skip = ['/PlatformAIX', '/PlatformDarwin', '/PlatformFuchsia', '/PlatformOther', '/PlatformWindows', '/WindowsMMap'];
+        $sources = array_filter(
+            array_merge(glob("{$profileSrc}/*.c") ?: [], glob("{$profileSrc}/*.cpp") ?: []),
+            fn ($f) => !array_any($skip, fn ($s) => str_contains($f, $s)),
+        );
+
+        $objDir = "{$srcRoot}/obj-profile-{$triple}";
+        f_mkdir($objDir, recursive: true);
+        $cflags = "-target {$triple} -c -O2 -fPIC -fvisibility=hidden "
+            . '-I' . escapeshellarg($profileInc) . ' '
+            . '-DCOMPILER_RT_HAS_ATOMICS=1 -DCOMPILER_RT_HAS_FCNTL_LCK=1 -DCOMPILER_RT_HAS_UNAME=1';
+        $srcArgs = implode(' ', array_map('escapeshellarg', $sources));
+        shell()->cd($objDir)->exec("zig cc {$cflags} {$srcArgs}");
+        shell()->cd($objDir)->exec('zig ar rcs ' . escapeshellarg($libPath) . ' *.o');
+    }
+
+    private function buildCrtObjects(string $srcRoot, string $crtBegin, string $crtEnd, string $triple): void
+    {
+        $beginSrc = "{$srcRoot}/lib/builtins/crtbegin.c";
+        $endSrc = "{$srcRoot}/lib/builtins/crtend.c";
+        if (!is_file($beginSrc) || !is_file($endSrc)) {
+            throw new BuildFailureException("llvm-compiler-rt: crtbegin/crtend source missing under {$srcRoot}/lib/builtins");
+        }
+        $cflags = "-target {$triple} -c -O2 -fPIC -fvisibility=hidden -DCRT_HAS_INITFINI_ARRAY";
+        foreach ([[$beginSrc, $crtBegin], [$endSrc, $crtEnd]] as [$src, $dst]) {
+            shell()->exec("zig cc {$cflags} -o " . escapeshellarg($dst) . ' ' . escapeshellarg($src));
+        }
+    }
+
+    /**
+     * Build libclang_rt.cpu_model.a, provides
+     * the globals that __builtin_cpu_supports() reference.
+     */
+    private function buildCpuModelBuiltins(string $srcRoot, string $libPath, string $triple): void
+    {
+        $builtins = "{$srcRoot}/lib/builtins";
+        $family = self::cpuModelArch($triple);
+        $cpuModelDir = "{$builtins}/cpu_model";
+        if (is_dir($cpuModelDir)) {
+            $src = "{$cpuModelDir}/{$family}.c";
+            $includes = '-I' . escapeshellarg($builtins) . ' -I' . escapeshellarg($cpuModelDir);
+        } else {
+            $src = "{$builtins}/cpu_model.c";
+            $includes = '-I' . escapeshellarg($builtins);
+        }
+        if (!is_file($src)) {
+            throw new BuildFailureException("llvm-compiler-rt: cpu_model source not found for {$triple} under {$builtins}");
+        }
+
+        $objDir = "{$srcRoot}/obj-cpu-model-{$triple}";
+        f_mkdir($objDir, recursive: true);
+        $obj = "{$objDir}/cpu_model.o";
+        $cflags = "-target {$triple} -c -O2 -fPIC {$includes}";
+        shell()->exec('zig cc ' . $cflags . ' -o ' . escapeshellarg($obj) . ' ' . escapeshellarg($src));
+        shell()->exec('zig ar rcs ' . escapeshellarg($libPath) . ' ' . escapeshellarg($obj));
+    }
+
+    private static function cpuModelArch(string $triple): ?string
+    {
+        $arch = explode('-', $triple)[0];
+        return match (true) {
+            in_array($arch, ['x86_64', 'amd64', 'i386', 'i686', 'x86'], true) => 'x86',
+            in_array($arch, ['aarch64', 'arm64'], true) => 'aarch64',
+            str_starts_with($arch, 'riscv') => 'riscv',
+            default => null,
+        };
+    }
+}
--- a/src/Package/Artifact/llvm_tools.php
+++ b/src/Package/Artifact/llvm_tools.php
@@ -0,0 +1,149 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Artifact;
+
+use StaticPHP\Artifact\ArtifactDownloader;
+use StaticPHP\Artifact\Downloader\DownloadResult;
+use StaticPHP\Artifact\Downloader\Type\CheckUpdateResult;
+use StaticPHP\Artifact\Downloader\Type\GitHubTokenSetupTrait;
+use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
+use StaticPHP\Attribute\Artifact\CustomBinary;
+use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Exception\BuildFailureException;
+use StaticPHP\Exception\DownloaderException;
+use StaticPHP\Package\PackageBuilder;
+
+class llvm_tools
+{
+    use GitHubTokenSetupTrait;
+
+    public const array TOOLS = ['llvm-objcopy', 'llvm-strip', 'llvm-profdata'];
+
+    #[CustomBinary('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function downBinary(ArtifactDownloader $downloader): DownloadResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        $tarball = "llvm-project-{$llvmVersion}.src.tar.xz";
+        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
+        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
+        default_shell()->executeCurlDownload($url, $tarballPath, headers: $this->getGitHubTokenHeaders(), retries: $downloader->getRetry());
+        return DownloadResult::archive($tarball, ['url' => $url, 'version' => $llvmVersion], extract: '{source_path}/llvm-tools', verified: false, version: $llvmVersion);
+    }
+
+    #[CustomBinaryCheckUpdate('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function checkUpdateBinary(?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        return new CheckUpdateResult(
+            old: $old_version,
+            new: $llvmVersion,
+            needUpdate: $old_version === null || $llvmVersion !== $old_version,
+        );
+    }
+
+    #[AfterBinaryExtract('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function postExtract(string $target_path): void
+    {
+        $this->buildForHost($target_path);
+    }
+
+    public function buildForHost(?string $sourceRoot = null): void
+    {
+        $sourceRoot ??= SOURCE_PATH . '/llvm-tools';
+        $binDir = PKG_ROOT_PATH . '/llvm-tools/bin';
+        if ($this->allBuilt($binDir)) {
+            return;
+        }
+        $llvmDir = "{$sourceRoot}/llvm";
+        if (!is_dir($llvmDir)) {
+            throw new BuildFailureException("llvm-tools: missing source at {$llvmDir} (extraction layout changed?)");
+        }
+        $buildDir = "{$sourceRoot}/build";
+        $installDir = PKG_ROOT_PATH . '/llvm-tools';
+        f_mkdir($buildDir, recursive: true);
+        f_mkdir($binDir, recursive: true);
+
+        $cmakeArgs = implode(' ', array_map('escapeshellarg', [
+            '-S', $llvmDir,
+            '-B', $buildDir,
+            '-DCMAKE_BUILD_TYPE=Release',
+            '-DLLVM_ENABLE_PROJECTS=',
+            '-DLLVM_TARGETS_TO_BUILD=',
+            '-DLLVM_INCLUDE_BENCHMARKS=OFF',
+            '-DLLVM_INCLUDE_TESTS=OFF',
+            '-DLLVM_INCLUDE_EXAMPLES=OFF',
+            '-DLLVM_INCLUDE_DOCS=OFF',
+            '-DLLVM_ENABLE_ZLIB=OFF',
+            '-DLLVM_ENABLE_ZSTD=OFF',
+            '-DLLVM_ENABLE_LIBXML2=OFF',
+            '-DLLVM_ENABLE_TERMINFO=OFF',
+            '-DLLVM_ENABLE_LIBEDIT=OFF',
+            '-DLLVM_ENABLE_LIBPFM=OFF',
+            '-DLLVM_BUILD_LLVM_DYLIB=OFF',
+            '-DLLVM_LINK_LLVM_DYLIB=OFF',
+            '-DBUILD_SHARED_LIBS=OFF',
+            '-DCMAKE_C_COMPILER=' . zig::binary('zig-cc'),
+            '-DCMAKE_CXX_COMPILER=' . zig::binary('zig-c++'),
+            '-DCMAKE_INSTALL_PREFIX=' . $installDir,
+        ]));
+        $jobs = ApplicationContext::get(PackageBuilder::class)->concurrency;
+        $targetArgs = implode(' ', array_map(fn ($t) => '--target ' . escapeshellarg($t), self::TOOLS));
+
+        shell()
+            ->setEnv(['SPC_TARGET' => GNU_ARCH . '-linux-musl'])
+            ->exec('cmake ' . $cmakeArgs)
+            ->exec('cmake --build ' . escapeshellarg($buildDir) . ' ' . $targetArgs . " -j {$jobs}");
+
+        foreach (self::TOOLS as $t) {
+            $built = "{$buildDir}/bin/{$t}";
+            if (!is_file($built)) {
+                throw new BuildFailureException("llvm-tools: missing build output {$built}");
+            }
+            copy($built, "{$binDir}/{$t}");
+            chmod("{$binDir}/{$t}", 0755);
+        }
+    }
+
+    public function allBuilt(string $binDir): bool
+    {
+        foreach (self::TOOLS as $t) {
+            $p = "{$binDir}/{$t}";
+            if (!is_file($p) || !is_executable($p)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private function detectLlvmVersion(): ?string
+    {
+        if (!zig::isInstalled()) {
+            return null;
+        }
+        [$rc, $out] = shell()->execWithResult(escapeshellarg(zig::binary()) . ' cc --version', false);
+        if ($rc !== 0) {
+            return null;
+        }
+        return preg_match('/clang version (\d+\.\d+\.\d+)/', implode("\n", $out), $m) ? $m[1] : null;
+    }
+}
--- a/src/Package/Artifact/msys2_build_essentials.php
+++ b/src/Package/Artifact/msys2_build_essentials.php
@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\BinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalEnvManager;
-
-class msys2_build_essentials
-{
-    // MSYS subsystem packages required for autotools-based builds.
-    private const REQUIRED_PACKAGES = ['make', 'autoconf', 'automake', 'libtool', 'pkgconf', 'perl', 'bison', 're2c'];
-
-    #[CustomBinary('msys2-build-essentials', ['windows-x86_64'])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        // MSYS2 nightly self-extracting archive; running it with `-y -oTARGET` extracts to TARGET\msys64\.
-        $url = 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.sfx.exe';
-        $filename = 'msys2-base-x86_64-latest.sfx.exe';
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-
-        return DownloadResult::file(
-            $filename,
-            ['url' => $url, 'version' => 'nightly'],
-            version: 'nightly',
-            extract: '{pkg_root_path}/msys2-build-essentials',
-        );
-    }
-
-    #[BinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function extractBinary(string $source_file, string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $source_file = FileSystem::convertPath($source_file);
-
-        // Guard: skip re-extraction if already initialized (marker written at end of this method).
-        $marker = "{$target_path}\\.spc-msys2-initialized";
-        if (file_exists($marker)) {
-            return;
-        }
-
-        if (!is_dir($target_path)) {
-            FileSystem::createDir($target_path);
-        }
-
-        cmd()->exec("\"{$source_file}\" -y -o\"{$target_path}\"");
-
-        $msys2_bin = "{$target_path}\\msys64\\usr\\bin";
-        if (!file_exists("{$msys2_bin}\\bash.exe")) {
-            throw new DownloaderException("MSYS2 extraction failed: bash.exe not found at {$msys2_bin}\\bash.exe");
-        }
-
-        // Add MSYS2 usr\bin to PATH so pacman.exe can load msys-2.0.dll.
-        GlobalEnvManager::addPathIfNotExists($msys2_bin);
-        GlobalEnvManager::putenv('CHERE_INVOKING=yes');
-        GlobalEnvManager::putenv('MSYSTEM=MSYS');
-
-        // Disable PGP signature checking: pacman-key --init requires a pseudo-TTY which is unavailable
-        // from PHP. Patching pacman.conf is the standard approach for CI pipelines.
-        $pacman_conf = "{$target_path}\\msys64\\etc\\pacman.conf";
-        FileSystem::replaceFileRegex($pacman_conf, '/^SigLevel\s*=.*$/m', 'SigLevel = Never');
-
-        $pacman = "{$target_path}\\msys64\\usr\\bin\\pacman.exe";
-
-        // Two-pass update as recommended by MSYS2 CI docs.
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-
-        $pkgs = implode(' ', self::REQUIRED_PACKAGES);
-        cmd()->exec("\"{$pacman}\" --noconfirm -S --needed {$pkgs}");
-
-        FileSystem::writeFile($marker, date('Y-m-d H:i:s'));
-    }
-
-    #[AfterBinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function afterExtract(string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $msys2_root = "{$target_path}\\msys64";
-
-        GlobalEnvManager::putenv("SPC_MSYS2_PATH={$msys2_root}");
-        GlobalEnvManager::addPathIfNotExists("{$msys2_root}\\usr\\bin");
-    }
-}
--- a/src/Package/Artifact/zig.php
+++ b/src/Package/Artifact/zig.php
@@ -15,6 +15,23 @@ use StaticPHP\Runtime\SystemTarget;

 class zig
 {
+    /** Directory zig extracts into. */
+    public static function path(): string
+    {
+        return PKG_ROOT_PATH . '/zig';
+    }
+
+    /** Path to a binary inside the zig install dir (zig, zig-cc, zig-c++, zig-ar, …). */
+    public static function binary(string $name = 'zig'): string
+    {
+        return self::path() . '/' . $name;
+    }
+
+    public static function isInstalled(): bool
+    {
+        return is_file(self::binary());
+    }
+
    #[CustomBinary('zig', [
        'linux-x86_64',
        'linux-aarch64',
@@ -61,7 +78,7 @@ class zig
        if ($file_hash !== $sha256) {
            throw new DownloaderException("Hash mismatch for downloaded Zig binary. Expected {$sha256}, got {$file_hash}");
        }
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $latest_version], extract: PKG_ROOT_PATH . '/zig', verified: true, version: $latest_version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $latest_version], extract: '{pkg_root_path}/zig', verified: true, version: $latest_version);
    }

    #[CustomBinaryCheckUpdate('zig', [
@@ -110,26 +127,24 @@ class zig
                break;
            }
        }
-        if ($all_exist) {
-            return;
+        if (!$all_exist) {
+            $script_path = ROOT_DIR . '/src/globals/scripts/zig-cc.sh';
+            $script_content = file_get_contents($script_path);
+
+            file_put_contents("{$target_path}/zig-cc", $script_content);
+            chmod("{$target_path}/zig-cc", 0755);
+
+            $script_content = str_replace('zig cc', 'zig c++', $script_content);
+            file_put_contents("{$target_path}/zig-c++", $script_content);
+            file_put_contents("{$target_path}/zig-ar", "#!/usr/bin/env bash\nexec zig ar $@");
+            file_put_contents("{$target_path}/zig-ld.lld", "#!/usr/bin/env bash\nexec zig ld.lld $@");
+            file_put_contents("{$target_path}/zig-ranlib", "#!/usr/bin/env bash\nexec zig ranlib $@");
+            file_put_contents("{$target_path}/zig-objcopy", "#!/usr/bin/env bash\nexec zig objcopy $@");
+            chmod("{$target_path}/zig-c++", 0755);
+            chmod("{$target_path}/zig-ar", 0755);
+            chmod("{$target_path}/zig-ld.lld", 0755);
+            chmod("{$target_path}/zig-ranlib", 0755);
+            chmod("{$target_path}/zig-objcopy", 0755);
        }
-
-        $script_path = ROOT_DIR . '/src/globals/scripts/zig-cc.sh';
-        $script_content = file_get_contents($script_path);
-
-        file_put_contents("{$target_path}/zig-cc", $script_content);
-        chmod("{$target_path}/zig-cc", 0755);
-
-        $script_content = str_replace('zig cc', 'zig c++', $script_content);
-        file_put_contents("{$target_path}/zig-c++", $script_content);
-        file_put_contents("{$target_path}/zig-ar", "#!/usr/bin/env bash\nexec zig ar $@");
-        file_put_contents("{$target_path}/zig-ld.lld", "#!/usr/bin/env bash\nexec zig ld.lld $@");
-        file_put_contents("{$target_path}/zig-ranlib", "#!/usr/bin/env bash\nexec zig ranlib $@");
-        file_put_contents("{$target_path}/zig-objcopy", "#!/usr/bin/env bash\nexec zig objcopy $@");
-        chmod("{$target_path}/zig-c++", 0755);
-        chmod("{$target_path}/zig-ar", 0755);
-        chmod("{$target_path}/zig-ld.lld", 0755);
-        chmod("{$target_path}/zig-ranlib", 0755);
-        chmod("{$target_path}/zig-objcopy", 0755);
    }
 }
--- a/src/Package/Extension/gmssl.php
+++ b/src/Package/Extension/gmssl.php
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Extension;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Util\FileSystem;
-
-#[Extension('gmssl')]
-class gmssl extends PhpExtensionPackage
-{
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1 compatibility with GmSSL >= 3.1.0 where SM2_VERIFY_CTX was removed (unified into SM2_SIGN_CTX)')]
-    public function patchSm2VerifyCtx(): void
-    {
-        // See: https://github.com/crazywhalecc/static-php-cli/issues/1182
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'SM2_VERIFY_CTX',
-            'SM2_SIGN_CTX'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1: pbkdf2_hmac_sm3_genkey was renamed to sm3_pbkdf2 in GmSSL >= 3.2.0')]
-    public function patchPbkdf2Rename(): void
-    {
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'pbkdf2_hmac_sm3_genkey',
-            'sm3_pbkdf2'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Add CHECK_LIB to config.w32 for static Windows builds')]
-    public function patchBeforeBuildconfWin(): bool
-    {
-        $configW32 = "{$this->getSourceDir()}/config.w32";
-        if (str_contains(FileSystem::readFile($configW32), 'CHECK_LIB(')) {
-            return false;
-        }
-        FileSystem::replaceFileStr(
-            $configW32,
-            'AC_DEFINE(',
-            'CHECK_LIB("gmssl.lib", "gmssl", PHP_GMSSL);' . PHP_EOL . 'AC_DEFINE('
-        );
-        return true;
-    }
-}
--- a/src/Package/Extension/xlswriter.php
+++ b/src/Package/Extension/xlswriter.php
@@ -11,6 +11,7 @@ use StaticPHP\Attribute\Package\Extension;
 use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
+use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\SourcePatcher;

 #[Extension('xlswriter')]
@@ -20,14 +21,20 @@ class xlswriter extends PhpExtensionPackage
    #[CustomPhpConfigureArg('Linux')]
    public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string
    {
-        $shared = $shared ? '=shared' : '';
-        $arg = "--with-xlswriter{$shared} --enable-reader";
+        $arg = '--with-xlswriter --enable-reader';
        if ($installer->getLibraryPackage('openssl')) {
            $arg .= ' --with-openssl=' . $installer->getLibraryPackage('openssl')->getBuildRootPath();
        }
        return $arg;
    }

+    #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-xlswriter')]
+    #[PatchDescription('Fix Unix build: add -std=gnu17 to CFLAGS to fix build errors on older GCC versions')]
+    public function patchBeforeUnixMake(): void
+    {
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
+    }
+
    #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-xlswriter')]
    #[PatchDescription('Fix Windows build: apply win32 patch and add UTF-8 BOM to theme.c')]
    public function patchBeforeMakeForWindows(): void
@@ -40,4 +47,11 @@ class xlswriter extends PhpExtensionPackage
            file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content);
        }
    }
+
+    public function getSharedExtensionEnv(): array
+    {
+        $parent = parent::getSharedExtensionEnv();
+        $parent['CFLAGS'] .= ' -std=gnu17';
+        return $parent;
+    }
 }
--- a/src/Package/Library/bzip2.php
+++ b/src/Package/Library/bzip2.php
@@ -17,7 +17,9 @@ class bzip2
    #[PatchBeforeBuild]
    public function patchBeforeBuild(LibraryPackage $lib): void
    {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS=-Wall', 'CFLAGS=-fPIC -Wall');
+        // Makefile pins -O2 -fPIC; inject SPC_DEFAULT_CFLAGS
+        $extra = deduplicate_flags(trim((string) getenv('SPC_DEFAULT_CFLAGS')) . ' -fPIC -Wall');
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS=-Wall', "CFLAGS={$extra}");
    }

    #[BuildFor('Windows')]
--- a/src/Package/Library/fastlz.php
+++ b/src/Package/Library/fastlz.php
@@ -18,9 +18,11 @@ class fastlz
    {
        $cc = getenv('CC') ?: 'cc';
        $ar = getenv('AR') ?: 'ar';
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $extra = $extra !== '' ? $extra . ' -fPIC' : '-O3 -fPIC';

        shell()->cd($lib->getSourceDir())->initializeEnv($lib)
-            ->exec("{$cc} -c -O3 -fPIC fastlz.c -o fastlz.o")
+            ->exec("{$cc} -c {$extra} fastlz.c -o fastlz.o")
            ->exec("{$ar} rcs libfastlz.a fastlz.o");

        // Copy header file
--- a/src/Package/Library/gettext_win.php
+++ b/src/Package/Library/gettext_win.php
@@ -22,7 +22,6 @@ class gettext_win
    {
        $ver = WindowsUtil::findVisualStudio();
        $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
            '17' => '\MSVC17',
            '16' => '\MSVC16',
            default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -45,9 +44,7 @@ class gettext_win
    {
        $vs_ver_dir = ApplicationContext::get('gettext_win_vs_ver_dir');
        cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}\\libintl_static")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0 /p:WholeProgramOptimization=false');
+            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0');
        FileSystem::createDir($lib->getLibDir());
        FileSystem::createDir($lib->getIncludeDir());
        // libintl_a.lib is the static library output; copy as libintl.lib for linker compatibility
--- a/src/Package/Library/gmssl.php
+++ b/src/Package/Library/gmssl.php
@@ -18,9 +18,7 @@ class gmssl
    #[BuildFor('Darwin')]
    public function build(LibraryPackage $lib): void
    {
-        UnixCMakeExecutor::create($lib)
-            ->addConfigureArgs('-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON')
-            ->build();
+        UnixCMakeExecutor::create($lib)->build();
    }

    #[BuildFor('Windows')]
@@ -35,7 +33,6 @@ class gmssl
                '-G "NMake Makefiles"',
                '-DWIN32=ON',
                '-DBUILD_SHARED_LIBS=OFF',
-                '-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON',
                '-DCMAKE_BUILD_TYPE=Release',
                '-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
                '-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
@@ -45,13 +42,13 @@ class gmssl
            ->toStep(1)
            ->build();

-        cmd()->cd($buildDir)->exec('nmake gmssl XCFLAGS=/MT');
+        // fix cmake_install.cmake install prefix (GmSSL overrides it internally)
+        $installCmake = "{$buildDir}\\cmake_install.cmake";
+        FileSystem::writeFile(
+            $installCmake,
+            'set(CMAKE_INSTALL_PREFIX "' . str_replace('\\', '/', $lib->getBuildRootPath()) . '")' . PHP_EOL . FileSystem::readFile($installCmake)
+        );

-        $libPath = "{$lib->getBuildRootPath()}/lib";
-        $incPath = "{$lib->getBuildRootPath()}/include/gmssl";
-        FileSystem::createDir($libPath);
-        FileSystem::createDir($incPath);
-        FileSystem::copy("{$buildDir}\\bin\\gmssl.lib", "{$libPath}/gmssl.lib");
-        FileSystem::copyDir("{$lib->getSourceDir()}\\include\\gmssl", $incPath);
+        cmd()->cd($buildDir)->exec('nmake install XCFLAGS=/MT');
    }
 }
--- a/src/Package/Library/icu.php
+++ b/src/Package/Library/icu.php
@@ -24,9 +24,12 @@ class icu
    #[BuildFor('Linux')]
    public function buildLinux(LibraryPackage $lib, ToolchainInterface $toolchain, PackageBuilder $builder): void
    {
+        // runConfigureICU bakes CXXFLAGS/LDFLAGS, apply user flags too
+        $userCxxFlags = trim((string) getenv('SPC_DEFAULT_CXXFLAGS'));
+        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LDFLAGS'));
        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -DPIC -fPIC"';
-        $cxxflags = 'CXXFLAGS="-std=c++17 -DPIC -fPIC -fno-ident"';
-        $ldflags = $toolchain->isStatic() ? 'LDFLAGS="-static"' : '';
+        $cxxflags = "CXXFLAGS=\"-std=c++17 -DPIC -fPIC -fno-ident {$userCxxFlags}\"";
+        $ldflags = $toolchain->isStatic() ? "LDFLAGS=\"-static {$userLdFlags}\"" : "LDFLAGS=\"{$userLdFlags}\"";
        shell()->cd($lib->getSourceDir() . '/source')->initializeEnv($lib)
            ->exec(
                "{$cppflags} {$cxxflags} {$ldflags} " .
--- a/src/Package/Library/jbig.php
+++ b/src/Package/Library/jbig.php
@@ -17,7 +17,9 @@ class jbig
    #[PatchBeforeBuild]
    public function patchBeforeBuild(LibraryPackage $lib): void
    {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC');
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $cflags = ($extra !== '' ? $extra : '-O2') . ' -W -Wno-unused-result -fPIC';
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', "CFLAGS = {$cflags}");
    }

    #[BuildFor('Darwin')]
--- a/src/Package/Library/krb5.php
+++ b/src/Package/Library/krb5.php
@@ -27,7 +27,7 @@ class krb5

        $resolved = array_keys($installer->getResolvedPackages());
        $spc = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->getPackageDepsConfig($lib->getName(), $resolved, include_suggests: true);
+        $config = $spc->getPackageDepsConfig($lib->getName(), $resolved);
        $extraEnv = [
            'CFLAGS' => '-fcommon',
            'LIBS' => $config['libs'],
--- a/src/Package/Library/libaom.php
+++ b/src/Package/Library/libaom.php
@@ -9,8 +9,10 @@ use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixCMakeExecutor;
 use StaticPHP\Runtime\Executor\WindowsCMakeExecutor;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 use StaticPHP\Toolchain\ZigToolchain;
+use StaticPHP\Util\System\UnixUtil;

 #[Library('libaom')]
 class libaom extends LibraryPackage
@@ -39,9 +41,23 @@ class libaom extends LibraryPackage
            $new = trim($extra . ' -D_GNU_SOURCE');
            f_putenv("SPC_COMPILER_EXTRA={$new}");
        }
+        $targetCpu = SystemTarget::getTargetArch();
+        if (str_starts_with($targetCpu, 'aarch')) {
+            $targetCpu = str_replace('aarch', 'arm', $targetCpu);
+        }
+        if (!UnixUtil::findCommand('nasm') && !UnixUtil::findCommand('yasm')) {
+            $targetCpu = 'generic';
+        }
        UnixCMakeExecutor::create($this)
            ->setBuildDir("{$this->getSourceDir()}/builddir")
-            ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
+            ->addConfigureArgs(
+                "-DAOM_TARGET_CPU={$targetCpu}",
+                '-DCONFIG_RUNTIME_CPU_DETECT=1',
+                '-DENABLE_EXAMPLES=OFF',
+                '-DENABLE_TESTS=OFF',
+                '-DENABLE_TOOLS=OFF',
+                '-DENABLE_DOCS=OFF',
+            )
            ->build();
        f_putenv("SPC_COMPILER_EXTRA={$extra}");
        $this->patchPkgconfPrefix(['aom.pc']);
--- a/src/Package/Library/libffi.php
+++ b/src/Package/Library/libffi.php
@@ -8,6 +8,7 @@ use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
+use StaticPHP\Runtime\SystemTarget;

 #[Library('libffi')]
 class libffi extends LibraryPackage
@@ -28,7 +29,7 @@ class libffi extends LibraryPackage
    #[BuildFor('Darwin')]
    public function buildDarwin(): void
    {
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
        UnixAutoconfExecutor::create($this)
            ->configure(
                "--host={$arch}-apple-darwin",
--- a/src/Package/Library/libffi_win.php
+++ b/src/Package/Library/libffi_win.php
@@ -21,7 +21,6 @@ class libffi_win
    {
        $ver = WindowsUtil::findVisualStudio();
        $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs17 solution, which msbuild builds via forward compatibility.
            '17' => '\win32\vs17_x64',
            '16' => '\win32\vs16_x64',
            default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported!"),
@@ -34,9 +33,7 @@ class libffi_win
    {
        $vs_ver_dir = ApplicationContext::get('libffi_win_vs_ver_dir');
        cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
+            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
        FileSystem::createDir($lib->getLibDir());
        FileSystem::createDir($lib->getIncludeDir());

--- a/src/Package/Library/libheif.php
+++ b/src/Package/Library/libheif.php
@@ -24,6 +24,17 @@ class libheif
                'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
            );
        }
+        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
+        $heif_properties = $lib->getSourceDir() . '/libheif/api/libheif/heif_properties.h';
+        if (file_exists($heif_properties)
+            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
+        ) {
+            FileSystem::replaceFileStr(
+                $heif_properties,
+                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
+                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
+            );
+        }
    }

    #[BuildFor('Darwin')]
--- a/src/Package/Library/libiconv_win.php
+++ b/src/Package/Library/libiconv_win.php
@@ -21,7 +21,6 @@ class libiconv_win
    {
        $ver = WindowsUtil::findVisualStudio();
        $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
            '17' => '\MSVC17',
            '16' => '\MSVC16',
            default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -34,9 +33,7 @@ class libiconv_win
    {
        $vs_ver_dir = ApplicationContext::get('vs_ver_dir');
        cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
+            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
        FileSystem::createDir($lib->getLibDir());
        FileSystem::createDir($lib->getIncludeDir());
        FileSystem::copy("{$lib->getSourceDir()}{$vs_ver_dir}\\x64\\lib\\libiconv.lib", "{$lib->getLibDir()}\\libiconv.lib");
--- a/src/Package/Library/liblz4.php
+++ b/src/Package/Library/liblz4.php
@@ -17,10 +17,17 @@ use StaticPHP\Util\FileSystem;
 class liblz4
 {
    #[PatchBeforeBuild]
-    #[PatchDescription('Fix Makefile install target for static liblz4')]
+    #[PatchDescription('Compile lib sources individually so -flto -c with multiple inputs works under zig-cc/clang')]
    public function patchBeforeBuild(LibraryPackage $lib): void
    {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/programs/Makefile', 'install: lz4', "install: lz4\n\ninstallewfwef: lz4");
+        // `-flto -c` with multiple input files only writes a .o for the
+        // first source — the others are silently dropped, leaving liblz4.a with a
+        // single object. Compile each source individually so all .o files exist.
+        FileSystem::replaceFileStr(
+            $lib->getSourceDir() . '/lib/Makefile',
+            "liblz4.a: \$(SRCFILES)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(COMPILE.c) \$^\n\t\$(AR) rcs \$@ *.o\nendif",
+            "liblz4.a: \$(SRCFILES:.c=.o)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(AR) rcs \$@ \$^\nendif"
+        );
    }

    #[BuildFor('Windows')]
--- a/src/Package/Library/libpng.php
+++ b/src/Package/Library/libpng.php
@@ -9,6 +9,7 @@ use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Runtime\Executor\WindowsCMakeExecutor;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\FileSystem;

 #[Library('libpng')]
@@ -24,7 +25,7 @@ class libpng
        ];

        // Enable architecture-specific optimizations
-        match (getenv('SPC_ARCH')) {
+        match (SystemTarget::getTargetArch()) {
            'x86_64' => $args[] = '--enable-intel-sse',
            'aarch64' => $args[] = '--enable-arm-neon',
            default => null,
--- a/src/Package/Library/libsodium.php
+++ b/src/Package/Library/libsodium.php
@@ -42,16 +42,13 @@ class libsodium
    {
        $ver = WindowsUtil::findVisualStudio();
        $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs2022 solution, which msbuild builds via forward compatibility.
            '17' => '\vs2022',
            '16' => '\vs2019',
            default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
        };

        cmd()->cd("{$lib->getSourceDir()}\\builds\\msvc{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:WholeProgramOptimization=false /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
+            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
        FileSystem::createDir($lib->getLibDir());
        FileSystem::createDir($lib->getIncludeDir());

--- a/src/Package/Library/libssh2.php
+++ b/src/Package/Library/libssh2.php
@@ -18,7 +18,6 @@ class libssh2
    {
        WindowsCMakeExecutor::create($lib)
            ->addConfigureArgs(
-                '-DCRYPTO_BACKEND=WinCNG',
                '-DENABLE_ZLIB_COMPRESSION=ON',
                '-DBUILD_TESTING=OFF'
            )
--- a/src/Package/Library/mpir.php
+++ b/src/Package/Library/mpir.php
@@ -21,7 +21,6 @@ class mpir
    {
        $ver = WindowsUtil::findVisualStudio();
        $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the build.vc17 solution, which msbuild builds via forward compatibility.
            '17' => '\build.vc17',
            '16' => '\build.vc16',
            default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
--- a/src/Package/Library/ncurses.php
+++ b/src/Package/Library/ncurses.php
@@ -6,6 +6,8 @@ namespace Package\Library;

 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
+use StaticPHP\Attribute\Package\PatchBeforeBuild;
+use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
@@ -16,6 +18,24 @@ use StaticPHP\Util\FileSystem;
 #[Library('ncursesw')]
 class ncurses
 {
+    #[PatchBeforeBuild]
+    #[PatchDescription('Filter clang/zig "N warning(s) generated." line out of MKlib_gen.sh preprocessor pipe')]
+    public function patchBeforeBuild(LibraryPackage $lib): void
+    {
+        // MKlib_gen.sh feeds the C preprocessor's stdout through a sed/awk
+        // pipeline into lib_gen.c. zig-cc/clang emits "N warning(s) generated."
+        // on stdout (not stderr), and that line ends up as invalid C in the
+        // generated source. Filter it out of the pipe before sed sees it.
+        $mklibGen = $lib->getSourceDir() . '/ncurses/base/MKlib_gen.sh';
+        if (is_file($mklibGen) && !str_contains((string) file_get_contents($mklibGen), "| grep -v ' generated")) {
+            FileSystem::replaceFileStr(
+                $mklibGen,
+                '$preprocessor $TMP 2>/dev/null \\',
+                "\$preprocessor \$TMP 2>/dev/null \\\n| grep -v ' generated\\.\$' \\",
+            );
+        }
+    }
+
    #[BuildFor('Darwin')]
    #[BuildFor('Linux')]
    public function build(LibraryPackage $package, ToolchainInterface $toolchain): void
@@ -45,6 +65,7 @@ class ncurses
            '--without-tests',
            '--without-dlsym',
            '--without-debug',
+            '--disable-stripping',
            '--enable-symlinks',
            "--with-terminfo-dirs={$terminfo_dirs}",
            "--bindir={$package->getBinDir()}",
--- a/src/Package/Library/openssl.php
+++ b/src/Package/Library/openssl.php
@@ -24,7 +24,7 @@ class openssl
    {
        if (SystemTarget::getTargetOS() === 'Windows') {
            global $argv;
-            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe';
+            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl-' . arch2gnu(php_uname('m')) . '-win\perl\bin\perl.exe';
            $perl = file_exists($perl_path_native) ? ($perl_path_native) : WindowsUtil::findCommand('perl.exe');
            if ($perl === null) {
                throw new EnvironmentException(
@@ -76,7 +76,7 @@ class openssl
    public function buildForDarwin(LibraryPackage $pkg): void
    {
        $zlib_libs = $pkg->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles();
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();

        shell()->cd($pkg->getSourceDir())->initializeEnv($pkg)
            ->exec(
@@ -95,12 +95,7 @@ class openssl
    #[BuildFor('Linux')]
    public function build(LibraryPackage $lib): void
    {
-        $arch = getenv('SPC_ARCH');
-
-        $env = "CC='" . getenv('CC') . ' -idirafter ' . BUILD_INCLUDE_PATH .
-            ' -idirafter /usr/include/ ' .
-            ' -idirafter /usr/include/' . getenv('SPC_ARCH') . '-linux-gnu/ ' .
-            "' ";
+        $arch = SystemTarget::getTargetArch();

        $ex_lib = trim($lib->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles()) . ' -ldl -pthread';
        $zlib_extra =
@@ -111,9 +106,15 @@ class openssl
        $openssl_dir ??= LinuxUtil::getOSRelease()['dist'] === 'redhat' ? '/etc/pki/tls' : '/etc/ssl';
        $ex_lib = trim($ex_lib);

+        // anything we want included (PGO -fprofile-*, LTO, custom hardening)
+        // has to be appended on the command line *after* the target name.
+        $userCFlags = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LDFLAGS'));
+        $userExtra = trim($userCFlags . ' ' . $userLdFlags);
+
        shell()->cd($lib->getSourceDir())->initializeEnv($lib)
            ->exec(
-                "{$env} ./Configure no-shared zlib " .
+                './Configure no-shared zlib ' .
                "--prefix={$lib->getBuildRootPath()} " .
                "--libdir={$lib->getLibDir()} " .
                "--openssldir={$openssl_dir} " .
@@ -121,7 +122,8 @@ class openssl
                'enable-pie ' .
                'no-legacy ' .
                'no-tests ' .
-                "linux-{$arch}"
+                "linux-{$arch} " .
+                $userExtra
            )
            ->exec('make clean')
            ->exec("make -j{$lib->getBuilder()->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
--- a/src/Package/Library/postgresql.php
+++ b/src/Package/Library/postgresql.php
@@ -58,7 +58,7 @@ class postgresql extends LibraryPackage
    public function buildUnix(PackageInstaller $installer, PackageBuilder $builder): void
    {
        $spc_config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()), include_suggests: $builder->getOption('with-suggests', false));
+        $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()));

        $env_vars = [
            'CFLAGS' => $config['cflags'] . ' -std=c17',
--- a/src/Package/Library/qdbm.php
+++ b/src/Package/Library/qdbm.php
@@ -20,6 +20,11 @@ class qdbm
    {
        $ac = UnixAutoconfExecutor::create($lib)->configure();
        FileSystem::replaceFileRegex($lib->getSourceDir() . '/Makefile', '/MYLIBS = libqdbm.a.*/m', 'MYLIBS = libqdbm.a');
+        // Makefile pins -O3, replace with SPC_DEFAULT_CFLAGS
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        if ($extra !== '') {
+            FileSystem::replaceFileRegex($lib->getSourceDir() . '/Makefile', '/^CFLAGS = .*$/m', "CFLAGS = -Wall {$extra}");
+        }
        $ac->make(SystemTarget::getTargetOS() === 'Darwin' ? 'mac' : '');
        $lib->patchPkgconfPrefix(['qdbm.pc']);
    }
--- a/src/Package/Library/unixodbc.php
+++ b/src/Package/Library/unixodbc.php
@@ -20,14 +20,27 @@ class unixodbc extends LibraryPackage
    {
        $sysconf_selector = match ($os = SystemTarget::getTargetOS()) {
            'Darwin' => match (SystemTarget::getTargetArch()) {
-                'x86_64' => is_dir('/usr/local/etc') ? '/usr/local/etc' : '/opt/local/etc',
-                'aarch64' => is_dir('/opt/homebrew/etc') ? '/opt/homebrew/etc' : '/opt/local/etc',
+                'x86_64' => '/usr/local/etc',
+                'aarch64' => '/opt/homebrew/etc',
                default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
            },
            'Linux' => '/etc',
            default => throw new WrongUsageException("Unsupported OS: {$os}"),
        };
-        UnixAutoconfExecutor::create($this)
+
+        // unixodbc bundles libltdl; libltdl is incompatible with -flto
+        // (https://bugs.gentoo.org/532672).
+        $stripLto = static fn (string $s): string => clean_spaces((string) preg_replace('/(^|\s)-flto(=\S+)?(?=\s|$)/', ' ', $s));
+        $cflags = $stripLto((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $cxxflags = $stripLto((string) getenv('SPC_DEFAULT_CXXFLAGS'));
+        $ldflags = $stripLto((string) getenv('SPC_DEFAULT_LDFLAGS'));
+
+        $make = UnixAutoconfExecutor::create($this)
+            ->setEnv([
+                'CFLAGS' => $cflags,
+                'CXXFLAGS' => $cxxflags,
+                'LDFLAGS' => $ldflags,
+            ])
            ->configure(
                '--disable-debug',
                '--disable-dependency-tracking',
@@ -35,8 +48,15 @@ class unixodbc extends LibraryPackage
                '--with-included-ltdl',
                "--sysconfdir={$sysconf_selector}",
                '--enable-gui=no',
-            )
-            ->make();
+            );
+
+        // The exe/ subdirectory builds odbcinst/iusql/etc, turn it into a no-op
+        file_put_contents(
+            "{$this->getSourceDir()}/exe/Makefile",
+            ".PHONY: all install clean check distclean install-strip\nall install clean check distclean install-strip:\n\t@true\n",
+        );
+
+        $make->make();
        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
        $this->patchLaDependencyPrefix();
    }
--- a/src/Package/Target/curl.php
+++ b/src/Package/Target/curl.php
@@ -40,7 +40,7 @@ class curl
            ->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
            ->addConfigureArgs(
                '-DBUILD_CURL_EXE=ON',
-                '-DZSTD_LIBRARY=' . BUILD_LIB_PATH . '/zstd_static.lib',
+                '-DZSTD_LIBRARY=zstd_static.lib',
                '-DBUILD_TESTING=OFF',
                '-DBUILD_EXAMPLES=OFF',
                '-DUSE_LIBIDN2=OFF',
--- a/src/Package/Target/php.php
+++ b/src/Package/Target/php.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Package\Target;

 use Package\Target\php\frankenphp;
+use Package\Target\php\pgo;
 use Package\Target\php\unix;
 use Package\Target\php\windows;
 use StaticPHP\Artifact\ArtifactCache;
@@ -48,6 +49,7 @@ class php extends TargetPackage
    use unix;
    use windows;
    use frankenphp;
+    use pgo;

    /** @var string[] Supported major PHP versions */
    public const array SUPPORTED_MAJOR_VERSIONS = ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'];
@@ -255,11 +257,6 @@ class php extends TargetPackage
            $installer->addBuildPackage('php-embed');
        }

-        // UPX compression: ensure the upx binary package is installed when requested
-        if ($package->getBuildOption('with-upx-pack')) {
-            $additional_packages[] = 'upx';
-        }
-
        return [...$extensions_pkg, ...$additional_packages];
    }

@@ -273,12 +270,14 @@ class php extends TargetPackage
            }
        }
        // linux does not support loading shared libraries when target is pure static
-        $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
-        if (SystemTarget::getTargetOS() === 'Linux' && ApplicationContext::get(ToolchainInterface::class)->isStatic() && $embed_type === 'shared') {
-            throw new WrongUsageException(
-                'Linux does not support loading shared libraries when linking libc statically. ' .
-                'Change SPC_CMD_VAR_PHP_EMBED_TYPE to static.'
-            );
+        if ($package->getName() === 'php-embed') {
+            $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
+            if (SystemTarget::getTargetOS() === 'Linux' && ApplicationContext::get(ToolchainInterface::class)->isStatic() && $embed_type === 'shared') {
+                throw new WrongUsageException(
+                    'Linux does not support loading shared libraries when linking libc statically. ' .
+                    'Change SPC_CMD_VAR_PHP_EMBED_TYPE to static.'
+                );
+            }
        }
    }

@@ -337,7 +336,7 @@ class php extends TargetPackage
            logger()->info("Adding hardcoded INI [{$source_name} = {$ini_value}]");
        }
        if (!empty($custom_ini)) {
-            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], [$package->getSourceDir(), $custom_ini]);
+            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], ['php_source_dir' => $package->getSourceDir(), 'ini' => $custom_ini]);
        }

        // Patch StaticPHP version
--- a/src/Package/Target/php/frankenphp.php
+++ b/src/Package/Target/php/frankenphp.php
@@ -73,10 +73,7 @@ trait frankenphp
            $staticFlags = '';
        }

-        $resolved = array_keys($installer->getResolvedPackages());
-        // remove self from deps
-        $resolved = array_filter($resolved, fn ($pkg_name) => $pkg_name !== $package->getName());
-        $config = new SPCConfigUtil()->config($resolved);
+        $config = new SPCConfigUtil()->config(['frankenphp']);
        $cflags = "{$package->getLibExtraCFlags()} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . " -DFRANKENPHP_VERSION={$frankenphp_version}";
        $libs = $config['libs'];

@@ -88,10 +85,13 @@ trait frankenphp
            $libs .= ' -lgcov';
        }

+        $extraLdProgram = clean_spaces((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'));
        $env = [
            'CGO_ENABLED' => '1',
            'CGO_CFLAGS' => clean_spaces($cflags),
-            'CGO_LDFLAGS' => "{$package->getLibExtraLdFlags()} {$staticFlags} {$config['ldflags']} {$libs}",
+            'CGO_LDFLAGS' => clean_spaces("{$package->getLibExtraLdFlags()} {$staticFlags} {$config['ldflags']} {$libs} {$extraLdProgram}"),
+            // cgo strips flags not on its safe allowlist; widen it
+            'CGO_LDFLAGS_ALLOW' => '-Wl,-z,.*|-Wl,--.*|-flto.*|-fprofile-.*',
            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
                '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
@@ -101,10 +101,12 @@ trait frankenphp
                "-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}",
            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
        ];
+        $pgo = file_exists("{$source_dir}/caddy/frankenphp/default.pgo") ? "--pgo {$source_dir}/caddy/frankenphp/default.pgo " : '';
        InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy'));
        shell()->cd(BUILD_LIB_PATH)
            ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$xcaddy_modules}");
+            ->exec('go clean -cache') // fix stale include evaluation
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddy_modules}");

        $builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp');
        $package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');
--- a/src/Package/Target/php/pgo.php
+++ b/src/Package/Target/php/pgo.php
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Target\php;
+
+use StaticPHP\Attribute\Package\AfterStage;
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\ConditionalOn;
+use StaticPHP\Attribute\PatchDescription;
+use StaticPHP\Exception\WrongUsageException;
+use StaticPHP\Package\TargetPackage;
+use StaticPHP\Util\Pgo\PgoContext;
+use StaticPHP\Util\SourcePatcher;
+
+trait pgo
+{
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'buildconfForUnix'], 'php')]
+    #[PatchDescription('Inject __llvm_profile_write_file() flush at php/frankenphp shutdown for instrumented builds')]
+    public function pgoApplyShutdownPatches(PgoContext $pgo): void
+    {
+        if (!$pgo->isInstrument() && !$pgo->isCsInstrument()) {
+            return;
+        }
+        foreach (PgoContext::SHUTDOWN_PATCHES as $dir => $patch) {
+            $cwd = SOURCE_PATH . '/' . $dir;
+            if (!is_dir($cwd)) {
+                continue;
+            }
+            if (!SourcePatcher::patchFile($patch, $cwd)) {
+                throw new WrongUsageException("PGO --phase=instrument: patch {$patch} failed to apply in {$cwd}");
+            }
+            logger()->info("PGO --phase=instrument: applied {$patch}");
+        }
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[AfterStage('php', [self::class, 'configureForUnix'], 'php')]
+    #[PatchDescription('Patch libtool to passthrough -fcs-profile-* for context-sensitive PGO')]
+    public function pgoPatchLibtoolForCsInstrument(PgoContext $pgo): void
+    {
+        if (!$pgo->isCsInstrument()) {
+            return;
+        }
+        $libtool = SOURCE_PATH . '/php-src/libtool';
+        if (!is_file($libtool)) {
+            return;
+        }
+        $contents = (string) file_get_contents($libtool);
+        if (str_contains($contents, '-fcs-profile-*')) {
+            return;
+        }
+        $patched = str_replace('-fprofile-*|-F*', '-fprofile-*|-fcs-profile-*|-F*', $contents);
+        if ($patched === $contents) {
+            logger()->warning('PGO --phase=cs-instrument: could not patch libtool for -fcs-profile-* passthrough');
+            return;
+        }
+        file_put_contents($libtool, $patched);
+        logger()->info('PGO --phase=cs-instrument: patched libtool for -fcs-profile-* passthrough');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'configureForUnix'], 'php')]
+    public function pgoApplyConfigureFlags(PgoContext $pgo): void
+    {
+        $sapis = $pgo->trainableSapis();
+        if ($sapis === []) {
+            return;
+        }
+        $pgo->applyEnvFor($sapis[0]);
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeCliForUnix'], 'php')]
+    public function pgoBeforeMakeCli(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'cli');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeCgiForUnix'], 'php')]
+    public function pgoBeforeMakeCgi(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'cgi');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeFpmForUnix'], 'php')]
+    public function pgoBeforeMakeFpm(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'fpm');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeMicroForUnix'], 'php')]
+    public function pgoBeforeMakeMicro(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'micro');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeEmbedForUnix'], 'php')]
+    public function pgoBeforeMakeEmbed(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'embed');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'buildFrankenphpForUnix'], 'php')]
+    public function pgoBeforeBuildFrankenphp(PgoContext $pgo): void
+    {
+        $pgo->applyEnvFor('frankenphp');
+        logger()->info("PGO {$pgo->mode}: applying flags for frankenphp");
+    }
+
+    private function pgoBeforeSapiMake(PgoContext $pgo, TargetPackage $package, string $sapi): void
+    {
+        $resolved = $pgo->resolveSapi($sapi);
+        if (!in_array($resolved, $pgo->trainableSapis(), true)) {
+            return;
+        }
+        shell()->cd($package->getSourceDir())->exec('make clean');
+        $pgo->applyEnvFor($sapi);
+        logger()->info("PGO {$pgo->mode}: applying flags for {$sapi}");
+    }
+}
--- a/src/Package/Target/php/unix.php
+++ b/src/Package/Target/php/unix.php
@@ -20,6 +20,7 @@ use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Package\TargetPackage;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ToolchainManager;
 use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\DirDiff;
 use StaticPHP\Util\FileSystem;
@@ -41,6 +42,15 @@ trait unix
        // php-src patches from micro (reads SPC_MICRO_PATCHES env var)
        SourcePatcher::patchPhpSrc();

+        $microFileinfo = "{$package->getSourceDir()}/sapi/micro/php_micro_fileinfo.c";
+        if (is_file($microFileinfo) && !str_contains((string) file_get_contents($microFileinfo), 'Elf32_Shdr')) {
+            FileSystem::replaceFileStr(
+                $microFileinfo,
+                'typedef Elf32_Ehdr Elf_Ehdr;',
+                'typedef Elf32_Ehdr Elf_Ehdr; typedef Elf32_Shdr Elf_Shdr;',
+            );
+        }
+
        // patch configure.ac for musl and musl-toolchain
        $musl = SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'musl';
        FileSystem::backupFile(SOURCE_PATH . '/php-src/configure.ac');
@@ -59,7 +69,7 @@ trait unix
        }

        if (self::getPHPVersionID() >= 80300 && self::getPHPVersionID() < 80400) {
-            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', $this->getSourceDir());
+            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
        }
    }

@@ -92,12 +102,10 @@ trait unix
        $args = [];
        $version_id = self::getPHPVersionID();

-        // disable undefined behavior sanitizer when opcache JIT is enabled (Linux only)
-        if (SystemTarget::getTargetOS() === 'Linux' && !$package->getBuildOption('disable-opcache-jit', false)) {
-            if ($version_id >= 80500 || $installer->isPackageResolved('ext-opcache')) {
-                $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-                GlobalEnvManager::putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
-            }
+        // disable undefined behavior sanitizer for zig, trips up on lua minijit and opcache-jit
+        if (SystemTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+            GlobalEnvManager::putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
        }
        // PHP JSON extension is built-in since PHP 8.0
        if ($version_id < 80000) {
@@ -129,6 +137,10 @@ trait unix
        $args[] = $installer->isPackageResolved('php-cgi') ? '--enable-cgi' : '--disable-cgi';
        $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
        $args[] = $installer->isPackageResolved('php-embed') ? "--enable-embed={$embed_type}" : '--disable-embed';
+        // Cross-compile: pass --host so configure picks the correct fiber asm file and host_cpu logic
+        if ($host_triple = SystemTarget::getAutoconfHostTriple()) {
+            $args[] = "--host={$host_triple}";
+        }
        $args[] = getenv('SPC_EXTRA_PHP_VARS') ?: null;
        $args = implode(' ', array_filter($args));

@@ -141,7 +153,7 @@ trait unix
        $this->seekPhpSrcLogFileOnException(fn () => shell()->cd($package->getSourceDir())->setEnv([
            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'CPPFLAGS' => "-I{$package->getIncludeDir()}",
-            'LDFLAGS' => "-L{$package->getLibDir()} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
+            'LDFLAGS' => "-L{$package->getLibDir()}",
            'LIBS' => $vars['EXTRA_LIBS'] ?? '',
        ])->exec("{$cmd} {$args} {$static_extension_str}"), $package->getSourceDir());
    }
@@ -168,7 +180,7 @@ trait unix

    #[BeforeStage('php', [self::class, 'makeForUnix'], 'php')]
    #[PatchDescription('Patch Makefile to fix //lib path for Linux builds')]
-    #[PatchDescription('Patch BUILD_CC to use system cc instead of zig-cc (prevents minilua crash)')]
+    #[PatchDescription('Under CI: patch BUILD_CC to system cc — zig-cc-built minilua segfaults there for reasons we cannot reproduce locally')]
    public function tryPatchMakefileUnix(TargetPackage $package, ToolchainInterface $toolchain): void
    {
        if (SystemTarget::getTargetOS() !== 'Linux') {
@@ -178,7 +190,8 @@ trait unix
        // replace //lib with /lib in Makefile
        shell()->cd($package->getSourceDir())->exec('sed -i "s|//lib|/lib|g" Makefile');

-        if ($toolchain instanceof ZigToolchain) {
+        // CI escape hatch: in CI, zig-cc-built minilua segfaults
+        if ($toolchain instanceof ZigToolchain && getenv('CI')) {
            $makefile = "{$package->getSourceDir()}/Makefile";
            FileSystem::replaceFileRegex($makefile, '/^BUILD_CC\s*=\s*zig-cc\s*$/m', 'BUILD_CC = cc');
        }
@@ -229,6 +242,7 @@ trait unix
    #[Stage]
    public function makeCliForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
+        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cli'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -239,11 +253,13 @@ trait unix

        $builder->deployBinary("{$package->getSourceDir()}/sapi/cli/php", BUILD_BIN_PATH . '/php');
        $package->setOutput('Binary path for cli SAPI', BUILD_BIN_PATH . '/php');
+        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-cli'), true, $start);
    }

    #[Stage]
    public function makeCgiForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
+        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cgi'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -254,11 +270,13 @@ trait unix

        $builder->deployBinary("{$package->getSourceDir()}/sapi/cgi/php-cgi", BUILD_BIN_PATH . '/php-cgi');
        $package->setOutput('Binary path for cgi SAPI', BUILD_BIN_PATH . '/php-cgi');
+        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-cgi'), true, $start);
    }

    #[Stage]
    public function makeFpmForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
+        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make fpm'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -269,43 +287,58 @@ trait unix

        $builder->deployBinary("{$package->getSourceDir()}/sapi/fpm/php-fpm", BUILD_BIN_PATH . '/php-fpm');
        $package->setOutput('Binary path for fpm SAPI', BUILD_BIN_PATH . '/php-fpm');
+        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-fpm'), true, $start);
    }

    #[Stage]
    #[PatchDescription('Patch phar extension for micro SAPI to support compressed phar')]
    public function makeMicroForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make micro'));
-        // apply --with-micro-fake-cli option
-        $vars = $this->makeVars($installer);
-        $vars['EXTRA_CFLAGS'] .= $package->getBuildOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-        $makeArgs = $this->makeVarsToArgs($vars);
-        // build
-        shell()->cd($package->getSourceDir())
-            ->setEnv($vars)
-            ->exec("make -j{$builder->concurrency} {$makeArgs} micro");
+        $start = microtime(true);
+        $phar_patched = false;
+        try {
+            if ($installer->isPackageResolved('ext-phar')) {
+                $phar_patched = true;
+                SourcePatcher::patchMicroPhar(self::getPHPVersionID());
+            }
+            InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make micro'));
+            // apply --with-micro-fake-cli option
+            $vars = $this->makeVars($installer);
+            $vars['EXTRA_CFLAGS'] .= $package->getBuildOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+            $makeArgs = $this->makeVarsToArgs($vars);
+            // build
+            shell()->cd($package->getSourceDir())
+                ->setEnv($vars)
+                ->exec("make -j{$builder->concurrency} {$makeArgs} micro");

-        $dst = BUILD_BIN_PATH . '/micro.sfx';
-        $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
-        // patch after UPX-ed micro.sfx (Linux only)
-        if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
-            // cut binary with readelf to remove UPX extra segment
-            [$ret, $out] = shell()->execWithResult("readelf -l {$dst} | awk '/LOAD|GNU_STACK/ {getline; print \\$1, \\$2, \\$3, \\$4, \\$6, \\$7}'");
-            $out[1] = explode(' ', $out[1]);
-            $offset = $out[1][0];
-            if ($ret !== 0 || !str_starts_with($offset, '0x')) {
-                throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
+            $dst = BUILD_BIN_PATH . '/micro.sfx';
+            $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
+            // patch after UPX-ed micro.sfx (Linux only)
+            if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
+                // cut binary with readelf to remove UPX extra segment
+                [$ret, $out] = shell()->execWithResult("readelf -l {$dst} | awk '/LOAD|GNU_STACK/ {getline; print \\$1, \\$2, \\$3, \\$4, \\$6, \\$7}'");
+                $out[1] = explode(' ', $out[1]);
+                $offset = $out[1][0];
+                if ($ret !== 0 || !str_starts_with($offset, '0x')) {
+                    throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
+                }
+                $offset = hexdec($offset);
+                // remove upx extra wastes
+                file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
+            }
+            $package->setOutput('Binary path for micro SAPI', $dst);
+            InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-micro'), true, $start);
+        } finally {
+            if ($phar_patched) {
+                SourcePatcher::unpatchMicroPhar();
            }
-            $offset = hexdec($offset);
-            // remove upx extra wastes
-            file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
        }
-        $package->setOutput('Binary path for micro SAPI', $dst);
    }

    #[Stage]
    public function makeEmbedForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
+        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make embed'));
        $shared_exts = array_filter(
            $installer->getResolvedPackages(),
@@ -319,22 +352,43 @@ trait unix
        $root = BUILD_ROOT_PATH;
        $sed_prefix = SystemTarget::getTargetOS() === 'Darwin' ? 'sed -i ""' : 'sed -i';

+        $vars = $this->makeVars($installer);
+        $makeArgs = $this->makeVarsToArgs($vars);
        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
+            ->setEnv($vars)
            ->exec("{$sed_prefix} \"s|^EXTENSION_DIR = .*|EXTENSION_DIR = /" . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make -j{$builder->concurrency} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
+            ->exec("make -j{$builder->concurrency} {$makeArgs} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
+
+        // install-modules deref'd libtool's `$ext.so → $ext-X.so` symlink for each built-with-php ext; restore them.
+        $release = null;
+        if (preg_match('/-release\s+(\S+)/', (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $m)) {
+            $release = $m[1];
+            foreach ($shared_exts as $ext) {
+                $name = $ext->getExtensionName();
+                $u = BUILD_MODULES_PATH . "/{$name}.so";
+                $v = BUILD_MODULES_PATH . "/{$name}-{$release}.so";
+                if (file_exists($v) && file_exists($u) && !is_link($u)) {
+                    unlink($u);
+                    symlink(basename($v), $u);
+                }
+            }
+        }

        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=shared -------------

-        // process libphp.so for shared embed
+        // INSTALL_IT for embed copies through libtool's symlink, leaving only unversioned libphp.{so,dylib} — rename and symlink back so shared exts can `-lphp`. (static libphp.a is never versioned, even with -release.)
        $suffix = SystemTarget::getTargetOS() === 'Darwin' ? 'dylib' : 'so';
        $libphp_so = "{$package->getLibDir()}/libphp.{$suffix}";
        if (file_exists($libphp_so)) {
-            // rename libphp.so if -release is set
-            if (SystemTarget::getTargetOS() === 'Linux') {
-                $this->processLibphpSoFile($libphp_so, $installer);
+            if ($release !== null) {
+                $versioned = "{$package->getLibDir()}/libphp-{$release}.{$suffix}";
+                if (file_exists($versioned)) {
+                    @unlink($versioned);
+                }
+                rename($libphp_so, $versioned);
+                symlink(basename($versioned), $libphp_so);
+                $libphp_so = $versioned;
            }
-            // deploy
            $builder->deployBinary($libphp_so, $libphp_so, false);
            $package->setOutput('Library path for embed SAPI', $libphp_so);
        }
@@ -343,6 +397,9 @@ trait unix
        $increment_files = $diff->getChangedFiles();
        $files = [];
        foreach ($increment_files as $increment_file) {
+            if (is_link($increment_file) || !file_exists($increment_file)) {
+                continue;
+            }
            $builder->deployBinary($increment_file, $increment_file, false);
            $files[] = basename($increment_file);
        }
@@ -350,6 +407,11 @@ trait unix
            $package->setOutput('Built shared extensions', implode(', ', $files));
        }

+        // phpize needs prefix patched whether libphp is .a or .so
+        $package->runStage([$this, 'patchUnixEmbedScripts']);
+
+        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-embed'), true, $start);
+
        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=static -------------

        // process libphp.a for static embed (only when present)
@@ -359,9 +421,6 @@ trait unix
            shell()->exec("{$ar} -t {$libphp_a} | grep '\\.a$' | xargs -n1 {$ar} d {$libphp_a}");
            UnixUtil::exportDynamicSymbols($libphp_a);
        }
-
-        // deploy embed php scripts
-        $package->runStage([$this, 'patchUnixEmbedScripts']);
    }

    #[Stage]
@@ -394,8 +453,15 @@ trait unix
        try {
            logger()->debug('Building shared extensions...');
            foreach ($shared_extensions as $extension) {
-                InteractiveTerm::setMessage('Building shared PHP extension: ' . ConsoleColor::yellow($extension->getName()));
-                $extension->buildShared();
+                $ext_start = microtime(true);
+                InteractiveTerm::setMessage('Building shared extension: ' . ConsoleColor::yellow($extension->getName()));
+                try {
+                    $extension->buildShared();
+                } catch (\Throwable $e) {
+                    InteractiveTerm::error('Building shared extension failed: ' . ConsoleColor::red($extension->getName()));
+                    throw $e;
+                }
+                InteractiveTerm::success('Built shared extension: ' . ConsoleColor::green($extension->getName()), true, $ext_start);
            }
        } finally {
            // restore php-config
@@ -487,6 +553,8 @@ trait unix
            $package->runStage([$this, 'makeForUnix']);
        }

+        // shared extensions build before frankenphp so their undefined references are
+        // collected into libphp's exported dynamic-symbol list.
        $package->runStage([$this, 'unixBuildSharedExt']);
    }

@@ -599,7 +667,7 @@ trait unix
        copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c');
        copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php');

-        $config = new SPCConfigUtil()->config($installer->getAvailableResolvedPackageNames());
+        $config = new SPCConfigUtil()->config(['php']);
        $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
        if ($toolchain->isStatic()) {
            $lens .= ' -static';
@@ -680,96 +748,37 @@ trait unix
        return $php;
    }

-    /**
-     * Rename libphp.so to libphp-<release>.so if -release is set in LDFLAGS.
-     */
-    private function processLibphpSoFile(string $libphpSo, PackageInstaller $installer): void
-    {
-        $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
-        $libDir = BUILD_LIB_PATH;
-        $modulesDir = BUILD_MODULES_PATH;
-        $realLibName = 'libphp.so';
-        $cwd = getcwd();
-
-        if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
-            $release = $matches[1];
-            $realLibName = "libphp-{$release}.so";
-            $libphpRelease = "{$libDir}/{$realLibName}";
-            if (!file_exists($libphpRelease) && file_exists($libphpSo)) {
-                rename($libphpSo, $libphpRelease);
-            }
-            if (file_exists($libphpRelease)) {
-                chdir($libDir);
-                if (file_exists($libphpSo)) {
-                    unlink($libphpSo);
-                }
-                symlink($realLibName, 'libphp.so');
-                shell()->exec(sprintf(
-                    'patchelf --set-soname %s %s',
-                    escapeshellarg($realLibName),
-                    escapeshellarg($libphpRelease)
-                ));
-            }
-            if (is_dir($modulesDir)) {
-                chdir($modulesDir);
-                foreach ($installer->getResolvedPackages(PhpExtensionPackage::class) as $ext) {
-                    if (!$ext->isBuildShared()) {
-                        continue;
-                    }
-                    $name = $ext->getName();
-                    $versioned = "{$name}-{$release}.so";
-                    $unversioned = "{$name}.so";
-                    $src = "{$modulesDir}/{$versioned}";
-                    $dst = "{$modulesDir}/{$unversioned}";
-                    if (is_file($src)) {
-                        rename($src, $dst);
-                        shell()->exec(sprintf(
-                            'patchelf --set-soname %s %s',
-                            escapeshellarg($unversioned),
-                            escapeshellarg($dst)
-                        ));
-                    }
-                }
-            }
-            chdir($cwd);
-        }
-
-        $target = "{$libDir}/{$realLibName}";
-        if (file_exists($target)) {
-            [, $output] = shell()->execWithResult('readelf -d ' . escapeshellarg($target));
-            $output = implode("\n", $output);
-            if (preg_match('/SONAME.*\[(.+)]/', $output, $sonameMatch)) {
-                $currentSoname = $sonameMatch[1];
-                if ($currentSoname !== basename($target)) {
-                    shell()->exec(sprintf(
-                        'patchelf --set-soname %s %s',
-                        escapeshellarg(basename($target)),
-                        escapeshellarg($target)
-                    ));
-                }
-            }
-        }
-    }
-
    /**
     * Make environment variables for php make.
     * This will call SPCConfigUtil to generate proper LDFLAGS and LIBS for static linking.
     */
    private function makeVars(PackageInstaller $installer): array
    {
-        $config = new SPCConfigUtil(['libs_only_deps' => true])->config($installer->getAvailableResolvedPackageNames());
+        $config = new SPCConfigUtil(['libs_only_deps' => true])->config(['php']);
        $static = ApplicationContext::get(ToolchainInterface::class)->isStatic() ? '-all-static' : '';
        $pie = SystemTarget::getTargetOS() === 'Linux' ? '-pie' : '';
+        $lib = BUILD_LIB_PATH;

        // Append SPC_EXTRA_LIBS to libs for dynamic linking support (e.g., X11)
        $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
        $libs = trim($config['libs'] . ' ' . $extra_libs);

+        // libtool input (libphp.la). `make EXTRA_LDFLAGS=…` cmdline overrides fully replace the Makefile value, so re-include $config['ldflags'] for -L paths.
+        $extra_ldflags = clean_spaces($config['ldflags'] . ' ' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'));
+        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared'
+            && !str_contains($extra_ldflags, '-avoid-version')
+            && !preg_match('/-release\s+\S+/', $extra_ldflags)) {
+            $extra_ldflags = trim($extra_ldflags . ' -avoid-version -module');
+        }
+
+        $extra_ldflags_program_env = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM') ?: '';
+        $extra_ldflags_program = clean_spaces("-L{$lib} {$static} {$pie} {$extra_ldflags_program_env}");
+
        return array_filter([
            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'EXTRA_CXXFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => deduplicate_flags(getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') . " {$config['ldflags']} {$static} {$pie}"),
-            'EXTRA_LDFLAGS' => $config['ldflags'],
+            'EXTRA_LDFLAGS' => $extra_ldflags,
+            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
            'EXTRA_LIBS' => $libs,
        ]);
    }
--- a/src/Package/Target/php/windows.php
+++ b/src/Package/Target/php/windows.php
@@ -39,13 +39,6 @@ trait windows
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('./buildconf.bat'));
        cmd()->cd($package->getSourceDir())->exec('.\buildconf.bat');

-        // Bypass the phpsdk_version check in configure.js: we use MSVC + msys2 instead of PHP SDK, so phpsdk_version is not available and the check would always fail.
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\configure.js",
-            'check_binary_tools_sdk();',
-            '/* check_binary_tools_sdk(); skipped: using MSVC + msys2 without PHP SDK */'
-        );
-
        if ($package->getBuildOption('enable-micro-win32') && $installer->isPackageResolved('php-micro')) {
            SourcePatcher::patchMicroWin32();
        } else {
@@ -95,17 +88,6 @@ trait windows
        cmd()->cd($package->getSourceDir())->exec(".\\configure.bat {$args} {$static_extension_str}");
    }

-    #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
-    #[PatchDescription('Patch Makefile to ensure buildroot/include comes before extension CFLAGS (fixes zip.h conflict with minizip)')]
-    public function patchMakefileIncludeOrder(TargetPackage $package): void
-    {
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\Makefile",
-            '$(CFLAGS_PHP_OBJ) $(CFLAGS)',
-            '$(CFLAGS) $(CFLAGS_PHP_OBJ)'
-        );
-    }
-
    #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
    #[PatchDescription('Patch Windows Makefile for CLI target')]
    public function patchCLITarget(TargetPackage $package): void
@@ -530,7 +512,6 @@ HEADER;
            $vc_matches = ['unknown', 'unknown'];
        } else {
            $vc_matches = match ($vc['major_version']) {
-                '18', // VS 2026 shares the VS2022 (v143) runtime conventions, so it reports as VS17.
                '17' => ['VS17', 'Visual C++ 2022'],
                '16' => ['VS16', 'Visual C++ 2019'],
                default => ['unknown', 'unknown'],
--- a/src/StaticPHP/Artifact/Artifact.php
+++ b/src/StaticPHP/Artifact/Artifact.php
@@ -27,12 +27,18 @@ class Artifact
    /** @var null|callable Bind custom source fetcher callback */
    protected mixed $custom_source_callback = null;

+    /** @var null|string Display label describing where the custom source callback came from */
+    protected ?string $custom_source_callback_origin = null;
+
    /** @var null|callable Bind custom source check-update callback */
    protected mixed $custom_source_check_update_callback = null;

    /** @var array<string, callable> Bind custom binary fetcher callbacks */
    protected mixed $custom_binary_callbacks = [];

+    /** @var array<string, string> Display label per platform describing where the custom binary callback came from */
+    protected array $custom_binary_callback_origins = [];
+
    /** @var array<string, callable> Bind custom binary check-update callbacks */
    protected array $custom_binary_check_update_callbacks = [];

@@ -285,15 +291,19 @@ class Artifact
     * Get source extraction directory.
     *
     * Rules:
-     * 1. If extract is not specified: SOURCE_PATH/{artifact_name}
-     * 2. If extract is relative path: SOURCE_PATH/{value}
-     * 3. If extract is absolute path: {value}
-     * 4. If extract is array (dict): handled by extractor (selective extraction)
+     * 1. If cache_type is 'local': use the absolute dirname recorded at download time (no symlink/copy).
+     * 2. If extract is not specified: SOURCE_PATH/{artifact_name}
+     * 3. If extract is relative path: SOURCE_PATH/{value}
+     * 4. If extract is absolute path: {value}
+     * 5. If extract is array (dict): handled by extractor (selective extraction)
     */
    public function getSourceDir(): string
    {
        // Prefer cache extract path, fall back to config
        $cache_info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo($this->name);
+        if (($cache_info['cache_type'] ?? null) === 'local' && isset($cache_info['dirname'])) {
+            return FileSystem::convertPath($cache_info['dirname']);
+        }
        $extract = is_string($cache_info['extract'] ?? null)
            ? $cache_info['extract']
            : ($this->config['source']['extract'] ?? null);
@@ -407,10 +417,13 @@ class Artifact

    /**
     * Set custom source fetcher callback.
+     *
+     * @param string $origin Short label shown in progress output (e.g. 'package downloader', 'custom url')
     */
-    public function setCustomSourceCallback(callable $callback): void
+    public function setCustomSourceCallback(callable $callback, string $origin = 'package downloader'): void
    {
        $this->custom_source_callback = $callback;
+        $this->custom_source_callback_origin = $origin;
    }

    public function getCustomSourceCallback(): ?callable
@@ -418,6 +431,11 @@ class Artifact
        return $this->custom_source_callback ?? null;
    }

+    public function getCustomSourceCallbackOrigin(): ?string
+    {
+        return $this->custom_source_callback_origin;
+    }
+
    /**
     * Set custom source check-update callback.
     */
@@ -452,11 +470,19 @@ class Artifact
     *
     * @param string   $target_os Target OS platform string (e.g. linux-x86_64)
     * @param callable $callback  Custom binary fetcher callback
+     * @param string   $origin    Short label shown in progress output (e.g. 'package downloader')
     */
-    public function setCustomBinaryCallback(string $target_os, callable $callback): void
+    public function setCustomBinaryCallback(string $target_os, callable $callback, string $origin = 'package downloader'): void
    {
        ConfigValidator::validatePlatformString($target_os);
        $this->custom_binary_callbacks[$target_os] = $callback;
+        $this->custom_binary_callback_origins[$target_os] = $origin;
+    }
+
+    public function getCustomBinaryCallbackOrigin(): ?string
+    {
+        $current_platform = SystemTarget::getCurrentPlatformString();
+        return $this->custom_binary_callback_origins[$current_platform] ?? null;
    }

    /**
@@ -644,7 +670,7 @@ class Artifact
            '{artifact_name}' => $this->name,
            '{pkg_root_path}' => PKG_ROOT_PATH,
            '{build_root_path}' => BUILD_ROOT_PATH,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH'),
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: WORKING_DIR . '/php-sdk-binary-tools',
            '{working_dir}' => WORKING_DIR,
            '{download_path}' => DOWNLOAD_PATH,
            '{source_path}' => SOURCE_PATH,
--- a/src/StaticPHP/Artifact/ArtifactDownloader.php
+++ b/src/StaticPHP/Artifact/ArtifactDownloader.php
@@ -317,7 +317,10 @@ class ArtifactDownloader
            if (!is_dir(DOWNLOAD_PATH)) {
                FileSystem::createDir(DOWNLOAD_PATH);
            }
-            logger()->info('Downloading' . implode(', ', array_map(fn ($x) => " '{$x->getName()}'", $this->artifacts)) . " with concurrency {$this->parallel} ...");
+            $pending = array_values(array_filter($this->artifacts, fn ($a) => $this->generateQueue($a) !== []));
+            if ($pending !== []) {
+                logger()->info('Downloading' . implode(', ', array_map(fn ($x) => " '{$x->getName()}'", $pending)) . " with concurrency {$this->parallel} ...");
+            }
            // Download artifacts parallelly
            if ($this->parallel > 1) {
                $this->downloadWithConcurrency();
@@ -551,8 +554,8 @@ class ArtifactDownloader
                $instance = null;
                $call = $this->downloaders[$item['config']['type']] ?? null;
                $type_display_name = match (true) {
-                    $item['lock'] === 'source' && ($callback = $artifact->getCustomSourceCallback()) !== null => 'user defined source downloader',
-                    $item['lock'] === 'binary' && ($callback = $artifact->getCustomBinaryCallback()) !== null => 'user defined binary downloader',
+                    $item['lock'] === 'source' && $artifact->getCustomSourceCallback() !== null => $artifact->getCustomSourceCallbackOrigin() ?? 'source package downloader',
+                    $item['lock'] === 'binary' && $artifact->getCustomBinaryCallback() !== null => $artifact->getCustomBinaryCallbackOrigin() ?? 'binary package downloader',
                    default => SPC_DOWNLOAD_TYPE_DISPLAY_NAME[$item['config']['type']] ?? $item['config']['type'],
                };
                $try_h = $try ? 'Try downloading' : 'Downloading';
@@ -731,6 +734,16 @@ class ArtifactDownloader
        $binary_downloaded = $artifact->isBinaryDownloaded(compare_hash: true);
        $source_downloaded = $artifact->isSourceDownloaded(compare_hash: true);

+        if ($source_downloaded && $artifact->getName() === 'php-src' && ($requested = $this->getOption('with-php'))) {
+            $info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo('php-src');
+            $cv = $info['version'] ?? null;
+            $ct = $info['cache_type'] ?? null;
+            $matches = $requested === 'git' ? $ct === 'git' : ($cv !== null && $ct !== 'git' && ($cv === $requested || str_starts_with($cv, $requested . '.')));
+            if (!$matches) {
+                $source_downloaded = false;
+            }
+        }
+
        $item_source = ['display' => 'source', 'lock' => 'source', 'config' => $artifact->getDownloadConfig('source')];
        $item_source_mirror = ['display' => 'source (mirror)', 'lock' => 'source', 'config' => $artifact->getDownloadConfig('source-mirror')];

@@ -825,21 +838,21 @@ class ArtifactDownloader
            if (isset($this->artifacts[$artifact_name])) {
                $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $custom_url) {
                    return (new Url())->download($artifact_name, ['url' => $custom_url], $downloader);
-                });
+                }, 'custom url');
            }
        }
        foreach ($this->custom_gits as $artifact_name => [$branch, $git_url]) {
            if (isset($this->artifacts[$artifact_name])) {
                $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $branch, $git_url) {
                    return (new Git())->download($artifact_name, ['rev' => $branch, 'url' => $git_url], $downloader);
-                });
+                }, 'custom git');
            }
        }
        foreach ($this->custom_locals as $artifact_name => $local_path) {
            if (isset($this->artifacts[$artifact_name])) {
                $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $local_path) {
                    return (new LocalDir())->download($artifact_name, ['dirname' => $local_path], $downloader);
-                });
+                }, 'custom local dir');
            }
        }
    }
--- a/src/StaticPHP/Artifact/ArtifactExtractor.php
+++ b/src/StaticPHP/Artifact/ArtifactExtractor.php
@@ -136,6 +136,12 @@ class ArtifactExtractor
            throw new WrongUsageException("Artifact source [{$name}] not downloaded, please download it first!");
        }

+        // Local (--custom-local): source lives in place at $cache_info['dirname'].
+        if (($cache_info['cache_type'] ?? null) === 'local') {
+            $artifact->emitAfterSourceExtract($artifact->getSourceDir());
+            return SPC_STATUS_ALREADY_EXTRACTED;
+        }
+
        $source_file = $this->cache->getCacheFullPath($cache_info);
        $target_path = $artifact->getSourceDir();

@@ -171,8 +177,12 @@ class ArtifactExtractor
            return SPC_STATUS_ALREADY_EXTRACTED;
        }

-        // Remove old directory if hash mismatch
-        if (is_dir($target_path)) {
+        // Remove old directory if hash mismatch.
+        // Guard: a symlink at $target_path (left over from older local-source handling) must be
+        // unlinked directly — never recurse into the link target, that would wipe the user's tree.
+        if (is_link($target_path)) {
+            @unlink($target_path);
+        } elseif (is_dir($target_path)) {
            logger()->notice("Source [{$name}] hash mismatch, re-extracting...");
            FileSystem::removeDir($target_path);
        }
@@ -614,7 +624,7 @@ class ArtifactExtractor
            '{source_path}' => SOURCE_PATH,
            '{download_path}' => DOWNLOAD_PATH,
            '{working_dir}' => WORKING_DIR,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH') ?: '',
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: '',
        ];
        return str_replace(array_keys($replacement), array_values($replacement), $path);
    }
--- a/src/StaticPHP/Artifact/Downloader/DownloadResult.php
+++ b/src/StaticPHP/Artifact/Downloader/DownloadResult.php
@@ -76,10 +76,9 @@ class DownloadResult
        ?string $version = null,
        array $metadata = [],
        ?string $downloader = null,
-        mixed $extract = null,
    ): DownloadResult {
        $cache_type = self::isArchiveFile($filename) ? 'archive' : 'file';
-        return new self($cache_type, config: $config, filename: $filename, extract: $extract, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
+        return new self($cache_type, config: $config, filename: $filename, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
    }

    /**
--- a/src/StaticPHP/Artifact/Downloader/Type/FileList.php
+++ b/src/StaticPHP/Artifact/Downloader/Type/FileList.php
@@ -45,11 +45,7 @@ class FileList implements DownloadTypeInterface, CheckUpdateInterface
            throw new DownloaderException("Failed to get {$name} file list from {$config['url']}");
        }
        $versions = [];
-        $cnt = count($matches['version']);
-        if ($cnt === 0) {
-            throw new DownloaderException("Failed to get {$name} file list from {$config['url']}: no version parsed");
-        }
-        logger()->debug("Matched {$cnt} versions for {$name}");
+        logger()->debug('Matched ' . count($matches['version']) . " versions for {$name}");
        foreach ($matches['version'] as $i => $version) {
            $lower = strtolower($version);
            foreach (['alpha', 'beta', 'rc', 'pre', 'nightly', 'snapshot', 'dev'] as $beta) {
--- a/src/StaticPHP/Attribute/Package/Tool.php
+++ b/src/StaticPHP/Attribute/Package/Tool.php
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Attribute\Package;
-
-/**
- * Indicates that the annotated class defines a tool package.
- */
-#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
-readonly class Tool
-{
-    public function __construct(public string $name) {}
-}
--- a/src/StaticPHP/Command/BaseCommand.php
+++ b/src/StaticPHP/Command/BaseCommand.php
@@ -54,10 +54,6 @@ abstract class BaseCommand extends Command
        }

        set_error_handler(static function ($error_no, $error_msg, $error_file, $error_line) {
-            // Respect the @ suppression operator (error_reporting() returns 0 when @ is used)
-            if (error_reporting() === 0) {
-                return true;
-            }
            $tips = [
                E_WARNING => ['PHP Warning: ', 'warning'],
                E_NOTICE => ['PHP Notice: ', 'notice'],
--- a/src/StaticPHP/Command/CraftCommand.php
+++ b/src/StaticPHP/Command/CraftCommand.php
@@ -9,7 +9,12 @@ use StaticPHP\Doctor\Doctor;
 use StaticPHP\Exception\ValidationException;
 use StaticPHP\Package\PackageBuilder;
 use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Registry\PackageLoader;
+use StaticPHP\Toolchain\ToolchainManager;
+use StaticPHP\Util\DependencyResolver;
 use StaticPHP\Util\FileSystem;
+use StaticPHP\Util\GlobalEnvManager;
+use StaticPHP\Util\Pgo\PgoContext;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Exception\ParseException;
@@ -21,6 +26,8 @@ class CraftCommand extends BaseCommand
    public function configure(): void
    {
        $this->addArgument('craft', null, 'Path to craft.yml file', WORKING_DIR . '/craft.yml');
+        $this->addOption('libs-only', null, null, 'Build only the libraries needed by the configured extensions (skip PHP and SAPI build).');
+        PgoContext::registerOptions($this);
    }

    public function handle(): int
@@ -36,18 +43,16 @@ class CraftCommand extends BaseCommand
        // set verbosity
        $this->output->setVerbosity($craft['verbosity']);

-        // sync logger level and ApplicationContext debug mode to match the new verbosity
-        $level = match ($this->output->getVerbosity()) {
-            OutputInterface::VERBOSITY_VERBOSE => 'info',
-            OutputInterface::VERBOSITY_VERY_VERBOSE, OutputInterface::VERBOSITY_DEBUG => 'debug',
-            default => 'warning',
-        };
-        logger()->setLevel($level);
-        ApplicationContext::setDebug($this->output->getVerbosity() >= OutputInterface::VERBOSITY_DEBUG);
-
        // apply env
        array_walk($craft['extra-env'], fn ($v, $k) => f_putenv("{$k}={$v}"));

+        // re-substitute env.ini's CC=${SPC_DEFAULT_CC} bindings.
+        ToolchainManager::initToolchain();
+        GlobalEnvManager::reapplyOsIni();
+
+        // stash craft for doctor checks that depend on what's being built (e.g. frankenphp → go-xcaddy)
+        ApplicationContext::set('craft', $craft);
+
        // run doctor
        if ($craft['craft-options']['doctor']) {
            $doctor = new Doctor($this->output, FIX_POLICY_AUTOFIX);
@@ -92,23 +97,67 @@ class CraftCommand extends BaseCommand
            FileSystem::resetDir(SOURCE_PATH);
        }

+        $pgo = $this->getOption('libs-only') ? null : PgoContext::tryFromInput($this->input, $craft['sapi'], $build_options);
+
        $starttime = microtime(true);
        // run installer
        $installer = new PackageInstaller($build_options);
        ApplicationContext::get(PackageBuilder::class)->setArgument('extensions', implode(',', $craft['extensions']));
-        $installer->addBuildPackage('php');
+
+        if ($this->getOption('libs-only')) {
+            $with_suggests = (bool) ($craft['build-options']['with-suggests'] ?? false);
+            $libs = $this->resolveLibsForExtensions($craft, $with_suggests);
+            if ($libs === []) {
+                $this->output->writeln('<comment>No libraries needed for the configured extensions; nothing to do.</comment>');
+                return static::SUCCESS;
+            }
+            foreach ($libs as $lib) {
+                $installer->addBuildPackage($lib);
+            }
+        } else {
+            $installer->addBuildPackage('php');
+        }
        $installer->run(true);

        $usedtime = round(microtime(true) - $starttime, 1);
+        $tag = $pgo !== null ? " (PGO {$pgo->mode})" : '';
        $this->output->writeln("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
-        $this->output->writeln("<info>✔ BUILD SUCCESSFUL ({$usedtime} s)</info>");
+        $this->output->writeln("<info>✔ BUILD SUCCESSFUL{$tag} ({$usedtime} s)</info>");
        $this->output->writeln("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");

+        if ($pgo !== null && $pgo->isInstrument()) {
+            $this->output->writeln("<comment>Next: exercise the instrumented binary, then re-run craft with --pgo to consume {$pgo->profileRoot}.</comment>");
+        }
+
        $installer->printBuildPackageOutputs();

        return static::SUCCESS;
    }

+    /** @return list<string> library package names transitively required by the configured extensions */
+    private function resolveLibsForExtensions(array $craft, bool $include_suggests): array
+    {
+        $exts = array_merge($craft['extensions'], $craft['shared-extensions'] ?? []);
+        $ext_pkgs = array_map(fn ($x) => "ext-{$x}", $exts);
+        $extra = $craft['packages'] ?? [];
+
+        $resolved = DependencyResolver::resolve(
+            array_merge($ext_pkgs, $extra),
+            include_suggests: $include_suggests,
+        );
+
+        $libs = [];
+        foreach ($resolved as $pkg_name) {
+            if (str_starts_with($pkg_name, 'ext-') || !PackageLoader::hasPackage($pkg_name)) {
+                continue;
+            }
+            if (PackageLoader::getPackage($pkg_name)->getType() === 'library') {
+                $libs[] = $pkg_name;
+            }
+        }
+        return $libs;
+    }
+
    /**
     * Validate and parse craft.yml file to array.
     *
@@ -119,7 +168,7 @@ class CraftCommand extends BaseCommand
     *     shared-extensions: array<string>,
     *     packages: array<string>,
     *     sapi: array<string>,
-     *     verbosity: 128|16|256|32|64|8,
+     *     verbosity: int,
     *     debug: bool,
     *     clean-build: bool,
     *     build-options: array<string, mixed>,
@@ -180,16 +229,11 @@ class CraftCommand extends BaseCommand
        }

        // verbosity
+        $verbosity_level = $craft['verbosity'] ?? OutputInterface::VERBOSITY_NORMAL;
        $debug = $craft['debug'] ?? false;
-        $verbosity_level = $debug
-            ? OutputInterface::VERBOSITY_DEBUG
-            : match ((int) ($craft['verbosity'] ?? 0)) {
-                OutputInterface::VERBOSITY_QUIET => OutputInterface::VERBOSITY_QUIET,
-                OutputInterface::VERBOSITY_VERBOSE => OutputInterface::VERBOSITY_VERBOSE,
-                OutputInterface::VERBOSITY_VERY_VERBOSE => OutputInterface::VERBOSITY_VERY_VERBOSE,
-                OutputInterface::VERBOSITY_DEBUG => OutputInterface::VERBOSITY_DEBUG,
-                default => OutputInterface::VERBOSITY_NORMAL,
-            };
+        if ($debug) {
+            $verbosity_level = OutputInterface::VERBOSITY_DEBUG;
+        }
        $craft['verbosity'] = $verbosity_level;

        // clean-build (if true, reset before all builds)
--- a/src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php
+++ b/src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php
@@ -16,7 +16,7 @@ class GenExtTestMatrixCommand extends BaseCommand

    private const array OS_RUNNERS = [
        'linux' => ['arch' => 'x86_64', 'runner' => 'ubuntu-latest', 'os_key' => 'Linux'],
-        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-2025', 'os_key' => 'Windows'],
+        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-latest', 'os_key' => 'Windows'],
        'macos' => ['arch' => 'aarch64', 'runner' => 'macos-15', 'os_key' => 'Darwin'],
    ];

@@ -60,8 +60,6 @@ class GenExtTestMatrixCommand extends BaseCommand
        'glfw',
        'imagick',
        'intl',
-        'mongodb',
-        'gmssl',
    ];

    /**
--- a/src/StaticPHP/Command/Dev/TestBotCommand.php
+++ b/src/StaticPHP/Command/Dev/TestBotCommand.php
@@ -154,7 +154,7 @@ class TestBotCommand extends BaseCommand
            'targets' => array_values($targets),
            'gen_matrix_args' => $gen_matrix_args,
            'gen_matrix_args_tier2' => $gen_matrix_args_tier2,
-            'php_versions' => $php_versions,
+            'php_versions' => array_values($php_versions),
            'tier2' => $tier2,
            'comment_body' => $comment_body,
        ];
@@ -253,13 +253,6 @@ class TestBotCommand extends BaseCommand
            $fmt($targets),
        );

-        $available_labels = implode(', ', [
-            '`need-test` (gate)',
-            '`test/linux` `test/windows` `test/macos` (platform)',
-            '`test/tier2` (extra arch)',
-            '`test/php-83` `test/php-84` (PHP version)',
-        ]);
-
        // Case 1: need-test absent → invite the author to add it
        if (!$need_test) {
            return implode("\n", [
@@ -268,9 +261,11 @@ class TestBotCommand extends BaseCommand
                '',
                $detected,
                '',
-                'To trigger extension build tests on this PR, add the `need-test` label.',
+                'To trigger extension build tests on this PR, add the `need-test` label:',
                '',
-                '**Available labels**: ' . $available_labels,
+                '**Gate**: `need-test`',
+                '**Platform filter** (optional, default all): `test/linux` `test/windows` `test/macos` · `test/tier2`',
+                '**PHP version** (optional, default 8.5): `test/php-83` `test/php-84`',
            ]);
        }

@@ -312,7 +307,6 @@ class TestBotCommand extends BaseCommand
            '',
            $detected,
            '**Active labels**: ' . $labels_str,
-            '**Available labels**: ' . $available_labels,
            '**Config**: ' . implode(' + ', $platform_parts) . ' | ' . $php_str,
        ]);
    }
--- a/src/StaticPHP/Command/ExtractCommand.php
+++ b/src/StaticPHP/Command/ExtractCommand.php
@@ -10,6 +10,7 @@ use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Registry\ArtifactLoader;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Util\DependencyResolver;
+use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -34,6 +35,7 @@ class ExtractCommand extends BaseCommand

    public function handle(): int
    {
+        GlobalEnvManager::afterInit();
        $cache = ApplicationContext::get(ArtifactCache::class);
        $extractor = new ArtifactExtractor($cache);
        $force_source = (bool) $this->getOption('source-only');
--- a/src/StaticPHP/Command/ResetCommand.php
+++ b/src/StaticPHP/Command/ResetCommand.php
@@ -4,14 +4,13 @@ declare(strict_types=1);

 namespace StaticPHP\Command;

-use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+use function Laravel\Prompts\confirm;

 #[AsCommand('reset')]
 class ResetCommand extends BaseCommand
@@ -47,11 +46,7 @@ class ResetCommand extends BaseCommand

        // Confirm with user unless --yes is specified
        if (!$this->input->getOption('yes')) {
-            $helper = $this->getHelper('question');
-            if (!$helper instanceof QuestionHelper) {
-                throw new SPCInternalException('Question helper not provided');
-            }
-            if (!$helper->ask($this->input, $this->output, new ConfirmationQuestion('Are you sure you want to continue? [y/N] ', false))) {
+            if (!confirm('Are you sure you want to continue?', false)) {
                InteractiveTerm::error(message: 'Reset operation cancelled.');
                return static::SUCCESS;
            }
--- a/src/StaticPHP/Command/SPCConfigCommand.php
+++ b/src/StaticPHP/Command/SPCConfigCommand.php
@@ -44,7 +44,7 @@ class SPCConfigCommand extends BaseCommand
            'absolute_libs' => (bool) $this->getOption('absolute-libs'),
        ]);
        $packages = array_merge(array_map(fn ($x) => "ext-{$x}", $extensions), $libraries);
-        $config = $util->config($packages, $include_suggests);
+        $config = $util->config($packages);

        $this->output->writeln(match (true) {
            $this->getOption('includes') => $config['cflags'],
--- a/src/StaticPHP/Config/ArtifactConfig.php
+++ b/src/StaticPHP/Config/ArtifactConfig.php
@@ -38,7 +38,7 @@ class ArtifactConfig
     */
    public static function loadFromFile(string $file, string $registry_name): string
    {
-        $content = @file_get_contents($file);
+        $content = file_get_contents($file);
        if ($content === false) {
            throw new WrongUsageException("Failed to read artifact config file: {$file}");
        }
--- a/src/StaticPHP/Config/ConfigType.php
+++ b/src/StaticPHP/Config/ConfigType.php
@@ -19,7 +19,6 @@ enum ConfigType
        'php-extension',
        'target',
        'virtual-target',
-        'tool',
    ];

    public static function validateLicenseField(mixed $value): bool
--- a/src/StaticPHP/Config/ConfigValidator.php
+++ b/src/StaticPHP/Config/ConfigValidator.php
@@ -44,13 +44,6 @@ class ConfigValidator
        'path' => ConfigType::LIST_ARRAY, // @
        'env' => ConfigType::ASSOC_ARRAY, // @
        'append-env' => ConfigType::ASSOC_ARRAY, // @
-
-        // tool type fields (nested under 'tool' key)
-        'tool' => ConfigType::ASSOC_ARRAY,
-        'provides' => ConfigType::LIST_ARRAY,
-        'binary-subdir' => ConfigType::STRING,
-        'install-root' => ConfigType::STRING,
-        'min-version' => ConfigType::STRING,
    ];

    public const array PACKAGE_FIELDS = [
@@ -74,9 +67,6 @@ class ConfigValidator
        'path' => false, // @
        'env' => false, // @
        'append-env' => false, // @
-
-        // tool fields (nested object)
-        'tool' => false,
    ];

    public const array SUFFIX_ALLOWED_FIELDS = [
@@ -88,7 +78,6 @@ class ConfigValidator
        'path',
        'env',
        'append-env',
-        'tools',
    ];

    public const array PHP_EXTENSION_FIELDS = [
@@ -103,13 +92,6 @@ class ConfigValidator
        'os' => false,
    ];

-    public const array TOOL_FIELDS = [
-        'provides' => true,
-        'binary-subdir' => false,
-        'install-root' => false,
-        'min-version' => false,
-    ];
-
    public const array ARTIFACT_TYPE_FIELDS = [ // [required_fields, optional_fields]
        'filelist' => [['url', 'regex'], ['extract']],
        'git' => [['url'], ['extract', 'submodules', 'rev', 'regex']],
@@ -238,8 +220,8 @@ class ConfigValidator
            $fields = self::SUFFIX_ALLOWED_FIELDS;
            self::validateSuffixAllowedFields($name, $pkg, $fields, $suffixes);

-            // check if "library|target|tool" package has artifact field
-            if (in_array($pkg['type'], ['target', 'library', 'tool']) && !isset($pkg['artifact'])) {
+            // check if "library|target" package has artifact field for target and library types
+            if (in_array($pkg['type'], ['target', 'library']) && !isset($pkg['artifact'])) {
                throw new ValidationException("Package [{$name}] in {$config_file_name} of type '{$pkg['type']}' must have an 'artifact' field");
            }

@@ -253,11 +235,6 @@ class ConfigValidator
                self::validatePhpExtensionFields($name, $pkg);
            }

-            // check if "tool" package has tool specific fields and validate inside
-            if ($pkg['type'] === 'tool') {
-                self::validateToolFields($name, $pkg);
-            }
-
            // check for unknown fields
            self::validateNoInvalidFields('package', $name, $pkg, array_keys(self::PACKAGE_FIELD_TYPES));
        }
@@ -420,29 +397,6 @@ class ConfigValidator
        self::validateNoInvalidFields('php-extension', $name, $pkg['php-extension'], array_keys(self::PHP_EXTENSION_FIELDS));
    }

-    /**
-     * Validate tool specific fields for tool package type.
-     */
-    private static function validateToolFields(int|string $name, mixed $pkg): void
-    {
-        if (!isset($pkg['tool'])) {
-            throw new ValidationException("Package {$name} of type 'tool' must have a 'tool' field");
-        }
-        if (!is_assoc_array($pkg['tool'])) {
-            throw new ValidationException("Package {$name} [tool] must be an object");
-        }
-        foreach (self::TOOL_FIELDS as $field => $required) {
-            if ($required && !isset($pkg['tool'][$field])) {
-                throw new ValidationException("Package {$name} [tool] must have required field [{$field}]");
-            }
-            if (isset($pkg['tool'][$field])) {
-                self::validatePackageFieldType($field, $pkg['tool'][$field], $name);
-            }
-        }
-        // check for unknown fields in tool
-        self::validateNoInvalidFields('tool', $name, $pkg['tool'], array_keys(self::TOOL_FIELDS));
-    }
-
    private static function validateNoInvalidFields(string $config_type, int|string $item_name, mixed $item_content, array $allowed_fields): void
    {
        foreach ($item_content as $k => $v) {
--- a/src/StaticPHP/Config/PackageConfig.php
+++ b/src/StaticPHP/Config/PackageConfig.php
@@ -16,7 +16,7 @@ class PackageConfig

    /**
     * Load package configurations from a specified directory.
-     * Only processes .json, .yml, and .yaml files (skips .gitkeep etc.).
+     * It will look for files matching the pattern 'pkg.*.json' and 'pkg.json'.
     */
    public static function loadFromDir(string $dir, string $registry_name): array
    {
@@ -28,10 +28,6 @@ class PackageConfig
        $files = FileSystem::scanDirFiles($dir, false);
        if (is_array($files)) {
            foreach ($files as $file) {
-                $ext = pathinfo($file, PATHINFO_EXTENSION);
-                if (!in_array($ext, ['json', 'yml', 'yaml'], true)) {
-                    continue;
-                }
                self::loadFromFile($file, $registry_name);
                $loaded[] = $file;
            }
--- a/src/StaticPHP/DI/ApplicationContext.php
+++ b/src/StaticPHP/DI/ApplicationContext.php
@@ -79,11 +79,11 @@ class ApplicationContext
    /**
     * Get a service from the container.
     *
-     * @template T of object
+     * @template T
     *
-     * @param class-string<T>|string $id Service identifier
+     * @param class-string<T> $id Service identifier
     *
-     * @return ($id is class-string<T> ? T : mixed)
+     * @return null|T
     */
    public static function get(string $id): mixed
    {
@@ -98,6 +98,25 @@ class ApplicationContext
        return self::getContainer()->has($id);
    }

+    /**
+     * Resolve $id, returning null if it can't be constructed.
+     * PHP-DI's has() returns true for any autowirable class even when get()
+     * would throw on missing scalar args — for "is this resolvable right now"
+     * semantics use this.
+     *
+     * @template T
+     * @param  class-string<T> $id
+     * @return null|T
+     */
+    public static function tryGet(string $id): mixed
+    {
+        try {
+            return self::getContainer()->get($id);
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
    /**
     * Set a service in the container.
     * Use sparingly - prefer configuration-based definitions.
--- a/src/StaticPHP/Doctor/Doctor.php
+++ b/src/StaticPHP/Doctor/Doctor.php
@@ -11,14 +11,11 @@ use StaticPHP\Registry\DoctorLoader;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\InteractiveTerm;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use ZM\Logger\ConsoleColor;

+use function Laravel\Prompts\confirm;
+
 readonly class Doctor
 {
    public function __construct(private ?OutputInterface $output = null, private int $auto_fix = FIX_POLICY_PROMPT, public readonly bool $interactive = true)
@@ -128,14 +125,9 @@ readonly class Doctor
            return false;
        }
        // prompt for fix
-        if ($this->auto_fix === FIX_POLICY_PROMPT) {
-            $helper = new QuestionHelper();
-            $input = ApplicationContext::has(InputInterface::class) ? ApplicationContext::get(InputInterface::class) : new ArrayInput([]);
-            $output = ApplicationContext::has(OutputInterface::class) ? ApplicationContext::get(OutputInterface::class) : $this->output ?? new ConsoleOutput();
-            if (!$helper->ask($input, $output, new ConfirmationQuestion('Do you want to try to fix this issue now? [Y/n] ', true))) {
-                $this->output?->writeln('<comment>You canceled fix.</comment>');
-                return false;
-            }
+        if ($this->auto_fix === FIX_POLICY_PROMPT && !confirm('Do you want to try to fix this issue now?')) {
+            $this->output?->writeln('<comment>You canceled fix.</comment>');
+            return false;
        }
        // perform fix
        InteractiveTerm::indicateProgress("Fixing {$result->getFixItem()} ... ");
--- a/src/StaticPHP/Doctor/Item/GoXcaddyCheck.php
+++ b/src/StaticPHP/Doctor/Item/GoXcaddyCheck.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StaticPHP\Doctor\Item;
+
+use StaticPHP\Attribute\Doctor\CheckItem;
+use StaticPHP\Attribute\Doctor\FixItem;
+use StaticPHP\Attribute\Doctor\OptionalCheck;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Doctor\CheckResult;
+use StaticPHP\Package\PackageInstaller;
+
+#[OptionalCheck([self::class, 'optionalCheck'])]
+class GoXcaddyCheck
+{
+    public static function optionalCheck(): bool
+    {
+        if (!ApplicationContext::has('craft')) {
+            return false;
+        }
+        /** @var null|array $craft */
+        $craft = ApplicationContext::get('craft');
+        return in_array('frankenphp', $craft['sapi'] ?? [], true);
+    }
+
+    #[CheckItem('if go-xcaddy is installed', level: 800)]
+    public function check(): CheckResult
+    {
+        if (!new PackageInstaller()->addInstallPackage('go-xcaddy')->isPackageInstalled('go-xcaddy')) {
+            return CheckResult::fail('go-xcaddy is not installed', 'install-go-xcaddy');
+        }
+        return CheckResult::ok(PKG_ROOT_PATH . '/go-xcaddy/bin/xcaddy');
+    }
+
+    #[FixItem('install-go-xcaddy')]
+    public function installGoXcaddy(): bool
+    {
+        $installer = new PackageInstaller(interactive: false);
+        $installer->addInstallPackage('go-xcaddy');
+        $installer->run(true);
+        return $installer->isPackageInstalled('go-xcaddy');
+    }
+}
--- a/src/StaticPHP/Doctor/Item/LlvmCompilerRtCheck.php
+++ b/src/StaticPHP/Doctor/Item/LlvmCompilerRtCheck.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StaticPHP\Doctor\Item;
+
+use Package\Artifact\llvm_compiler_rt;
+use Package\Artifact\zig;
+use StaticPHP\Attribute\Doctor\CheckItem;
+use StaticPHP\Attribute\Doctor\FixItem;
+use StaticPHP\Attribute\Doctor\OptionalCheck;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Doctor\CheckResult;
+use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Runtime\SystemTarget;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ZigToolchain;
+
+#[OptionalCheck([self::class, 'optionalCheck'])]
+class LlvmCompilerRtCheck
+{
+    public static function optionalCheck(): bool
+    {
+        return ApplicationContext::get(ToolchainInterface::class) instanceof ZigToolchain;
+    }
+
+    /** @noinspection PhpUnused */
+    #[CheckItem('if llvm-compiler-rt is built for current target', level: 799)]
+    public function checkLlvmCompilerRt(): CheckResult
+    {
+        $libDir = zig::path() . '/lib/' . SystemTarget::getCanonicalTriple();
+        if (new llvm_compiler_rt()->isBuilt($libDir)) {
+            return CheckResult::ok($libDir);
+        }
+        return CheckResult::fail('llvm-compiler-rt is not built for ' . SystemTarget::getCanonicalTriple(), 'build-llvm-compiler-rt');
+    }
+
+    #[FixItem('build-llvm-compiler-rt')]
+    public function fixLlvmCompilerRt(): bool
+    {
+        $installer = new PackageInstaller(interactive: false);
+        $installer->addInstallPackage('llvm-compiler-rt');
+        $installer->run(true);
+        new llvm_compiler_rt()->buildForTriple();
+        $libDir = zig::path() . '/lib/' . SystemTarget::getCanonicalTriple();
+        return new llvm_compiler_rt()->isBuilt($libDir);
+    }
+}
--- a/src/StaticPHP/Doctor/Item/LlvmToolsCheck.php
+++ b/src/StaticPHP/Doctor/Item/LlvmToolsCheck.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StaticPHP\Doctor\Item;
+
+use Package\Artifact\llvm_tools;
+use StaticPHP\Attribute\Doctor\CheckItem;
+use StaticPHP\Attribute\Doctor\FixItem;
+use StaticPHP\Attribute\Doctor\OptionalCheck;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Doctor\CheckResult;
+use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ZigToolchain;
+
+#[OptionalCheck([self::class, 'optionalCheck'])]
+class LlvmToolsCheck
+{
+    public static function optionalCheck(): bool
+    {
+        return ApplicationContext::get(ToolchainInterface::class) instanceof ZigToolchain;
+    }
+
+    /** @noinspection PhpUnused */
+    #[CheckItem('if llvm-tools (objcopy/strip/profdata) are built', level: 798)]
+    public function checkLlvmTools(): CheckResult
+    {
+        $binDir = PKG_ROOT_PATH . '/llvm-tools/bin';
+        if (new llvm_tools()->allBuilt($binDir)) {
+            return CheckResult::ok($binDir);
+        }
+        return CheckResult::fail('llvm-tools are not built', 'build-llvm-tools');
+    }
+
+    #[FixItem('build-llvm-tools')]
+    public function fixLlvmTools(): bool
+    {
+        $installer = new PackageInstaller(interactive: false);
+        $installer->addInstallPackage('llvm-tools');
+        $installer->run(true);
+        new llvm_tools()->buildForHost();
+        return new llvm_tools()->allBuilt(PKG_ROOT_PATH . '/llvm-tools/bin');
+    }
+}
--- a/src/StaticPHP/Doctor/Item/MacOSToolCheck.php
+++ b/src/StaticPHP/Doctor/Item/MacOSToolCheck.php
@@ -33,20 +33,15 @@ class MacOSToolCheck
        'glibtoolize',
    ];

-    #[CheckItem('if homebrew or macports has installed', limit_os: 'Darwin', level: 998)]
-    public function checkBrewOrPorts(): ?CheckResult
+    #[CheckItem('if homebrew has installed', limit_os: 'Darwin', level: 998)]
+    public function checkBrew(): ?CheckResult
    {
-        $brewPath = MacOSUtil::findCommand('brew');
-        $portPath = MacOSUtil::findCommand('port');
-
-        if ($brewPath && $brewPath !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
-            return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
-        }
-
-        if ($brewPath === null && $portPath === null) {
+        if (($path = MacOSUtil::findCommand('brew')) === null) {
            return CheckResult::fail('Homebrew is not installed', 'brew');
        }
-
+        if ($path !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
+            return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
+        }
        return CheckResult::ok();
    }

@@ -65,8 +60,8 @@ class MacOSToolCheck
        return CheckResult::ok();
    }

-    #[CheckItem('if homebrew or macports llvm are installed', limit_os: 'Darwin')]
-    public function checkBrewOrPortsLLVM(): ?CheckResult
+    #[CheckItem('if homebrew llvm are installed', limit_os: 'Darwin')]
+    public function checkBrewLLVM(): ?CheckResult
    {
        if (getenv('SPC_USE_LLVM') === 'brew') {
            $homebrew_prefix = getenv('HOMEBREW_PREFIX') ?: (SystemTarget::getTargetArch() === 'aarch64' ? '/opt/homebrew' : '/usr/local/homebrew');
@@ -76,16 +71,6 @@ class MacOSToolCheck
            }
            return CheckResult::ok($path);
        }
-
-        if (getenv('SPC_USE_LLVM') === 'port') {
-            $macportsPrefix = '/opt/local';
-
-            if (($path = MacOSUtil::findCommand('clang', ["{$macportsPrefix}/bin"])) === null) {
-                return CheckResult::fail('MacPorts llvm is not installed', 'build-tools', ['missing' => ['llvm']]);
-            }
-            return CheckResult::ok($path);
-        }
-
        return null;
    }

@@ -106,7 +91,7 @@ class MacOSToolCheck
                if ($command_path !== []) {
                    return CheckResult::fail("Current {$bison} version is too old: " . $matches[0]);
                }
-                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin']);
+                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin']);
            }
            return CheckResult::ok($matches[0]);
        }
@@ -123,9 +108,6 @@ class MacOSToolCheck
    #[FixItem('build-tools')]
    public function fixBuildTools(array $missing): bool
    {
-        $brewPath = MacOSUtil::findCommand('brew');
-        $portPath = MacOSUtil::findCommand('port');
-
        $replacement = [
            'glibtoolize' => 'libtool',
        ];
@@ -133,18 +115,7 @@ class MacOSToolCheck
            if (isset($replacement[$cmd])) {
                $cmd = $replacement[$cmd];
            }
-
-            if ($brewPath !== null) {
-                shell()->exec('brew install --formula ' . escapeshellarg($cmd));
-                continue;
-            }
-
-            if ($portPath !== null) {
-                shell()->exec('port install ' . escapeshellarg($cmd));
-                continue;
-            }
-
-            return false;
+            shell()->exec('brew install --formula ' . escapeshellarg($cmd));
        }
        return true;
    }
--- a/src/StaticPHP/Doctor/Item/WindowsToolCheck.php
+++ b/src/StaticPHP/Doctor/Item/WindowsToolCheck.php
@@ -54,24 +54,13 @@ class WindowsToolCheck
        return CheckResult::ok();
    }

-    #[CheckItem('if msys2-build-essentials is installed', limit_os: 'Windows', level: 996)]
-    public function checkMsys2(): ?CheckResult
+    #[CheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 996)]
+    public function checkSDK(): ?CheckResult
    {
-        $marker = PKG_ROOT_PATH . '\msys2-build-essentials\.spc-msys2-initialized';
-        if (!file_exists($marker)) {
-            return CheckResult::fail('msys2-build-essentials not installed', 'install-msys2-build-essentials');
+        if (!file_exists(getenv('PHP_SDK_PATH') . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) {
+            return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk');
        }
-        return CheckResult::ok(PKG_ROOT_PATH . '\msys2-build-essentials\msys64');
-    }
-
-    #[CheckItem('if 7za.exe is installed', limit_os: 'Windows', level: 999)]
-    public function check7zaWin(): ?CheckResult
-    {
-        $path = FileSystem::convertPath(PKG_ROOT_PATH . '\bin\7za.exe');
-        if (!file_exists($path)) {
-            return CheckResult::fail('7za.exe not found', 'install-7za-win');
-        }
-        return CheckResult::ok($path);
+        return CheckResult::ok(getenv('PHP_SDK_PATH'));
    }

    #[CheckItem('if nasm installed', level: 995)]
@@ -123,20 +112,12 @@ class WindowsToolCheck
        return true;
    }

-    #[FixItem('install-msys2-build-essentials')]
-    public function installMsys2(): bool
+    #[FixItem('install-php-sdk')]
+    public function installSDK(): bool
    {
+        FileSystem::removeDir(getenv('PHP_SDK_PATH'));
        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('msys2-build-essentials');
-        $installer->run(true);
-        return true;
-    }
-
-    #[FixItem('install-7za-win')]
-    public function install7zaWin(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('7za-win');
+        $installer->addInstallPackage('php-sdk-binary-tools');
        $installer->run(true);
        return true;
    }
--- a/src/StaticPHP/Doctor/Item/ZigCheck.php
+++ b/src/StaticPHP/Doctor/Item/ZigCheck.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace StaticPHP\Doctor\Item;

+use Package\Artifact\zig;
 use StaticPHP\Attribute\Doctor\CheckItem;
 use StaticPHP\Attribute\Doctor\FixItem;
 use StaticPHP\Attribute\Doctor\OptionalCheck;
@@ -26,7 +27,7 @@ class ZigCheck
    public function checkZig(): CheckResult
    {
        if (new PackageInstaller()->addInstallPackage('zig')->isPackageInstalled('zig')) {
-            return CheckResult::ok();
+            return CheckResult::ok(zig::binary());
        }
        return CheckResult::fail('zig is not installed', 'install-zig');
    }
--- a/src/StaticPHP/Package/Package.php
+++ b/src/StaticPHP/Package/Package.php
@@ -120,20 +120,6 @@ abstract class Package
        return false;
    }

-    /**
-     * Get the target directory where this package's artifacts should be placed.
-     *
-     * Libraries install to BUILD_ROOT_PATH (static-libs, headers, pkg-configs).
-     * Tools install to PKG_ROOT_PATH (executables).
-     * Extensions install to php-src/ext/ (shared objects).
-     *
-     * Override in subclasses to change the default.
-     */
-    public function getInstallTarget(): string
-    {
-        return BUILD_ROOT_PATH;
-    }
-
    /**
     * Add a stage to the package.
     */
--- a/src/StaticPHP/Package/PackageBuilder.php
+++ b/src/StaticPHP/Package/PackageBuilder.php
@@ -11,6 +11,8 @@ use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\GlobalPathTrait;
 use StaticPHP\Util\InteractiveTerm;
@@ -178,14 +180,15 @@ class PackageBuilder
        if (SystemTarget::getTargetOS() === 'Darwin') {
            shell()->exec("dsymutil -f {$binary_path} -o {$debug_file}");
        } elseif (SystemTarget::getTargetOS() === 'Linux') {
+            $objcopy = getenv('OBJCOPY') ?: 'objcopy';
            if ($eu_strip = LinuxUtil::findCommand('eu-strip')) {
                shell()
                    ->exec("{$eu_strip} -f {$debug_file} {$binary_path}")
-                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
            } else {
                shell()
-                    ->exec("objcopy --only-keep-debug {$binary_path} {$debug_file}")
-                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("{$objcopy} --only-keep-debug {$binary_path} {$debug_file}")
+                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
            }
        } else {
            logger()->debug('extractDebugInfo is only supported on Linux and macOS');
@@ -199,9 +202,12 @@ class PackageBuilder
     */
    public function stripBinary(string $binary_path): void
    {
+        $strip = ApplicationContext::tryGet(ToolchainInterface::class) instanceof ZigToolchain
+            ? PKG_ROOT_PATH . '/llvm-tools/bin/llvm-strip'
+            : 'strip';
        shell()->exec(match (SystemTarget::getTargetOS()) {
-            'Darwin' => "strip -S {$binary_path}",
-            'Linux' => "strip --strip-unneeded {$binary_path}",
+            'Darwin' => "{$strip} -S {$binary_path}",
+            'Linux' => "{$strip} --strip-unneeded {$binary_path}",
            'Windows' => 'echo "Skip strip on Windows"', // Windows strip is not available for now
            default => throw new SPCInternalException('stripBinary is only supported on Linux and macOS'),
        });
--- a/src/StaticPHP/Package/PackageInstaller.php
+++ b/src/StaticPHP/Package/PackageInstaller.php
@@ -11,7 +11,6 @@ use StaticPHP\Artifact\ArtifactExtractor;
 use StaticPHP\Artifact\DownloaderOptions;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Exception\EnvironmentException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Runtime\SystemTarget;
@@ -76,9 +75,6 @@ class PackageInstaller
        }
        // special check for php target packages
        if (in_array($package->getName(), ['php', 'php-cli', 'php-fpm', 'php-micro', 'php-cgi', 'php-embed', 'frankenphp'], true)) {
-            if (!$package instanceof TargetPackage) {
-                throw new WrongUsageException("Package '{$package->getName()}' is expected to be a TargetPackage.");
-            }
            $this->handlePhpTargetPackage($package);
            return $this;
        }
@@ -158,6 +154,9 @@ class PackageInstaller
            $this->resolvePackages();
        }

+        $this->reconcilePhpSrcVersion();
+        $this->emitPreInstallEvents();
+
        if ($this->interactive && !$disable_delay_msg) {
            // show install or build options in terminal with beautiful output
            $this->printInstallerInfo();
@@ -168,9 +167,6 @@ class PackageInstaller
        // Early validation: check if packages can be built or installed before downloading
        $this->validatePackagesBeforeBuild();

-        // Check that all required tools are installed before proceeding
-        $this->ensureRequiredTools();
-
        // check download
        if ($this->download) {
            $downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->options, 'dl');
@@ -222,7 +218,7 @@ class PackageInstaller
            if (!$is_to_build && $should_use_binary) {
                // install binary
                if ($this->interactive) {
-                    InteractiveTerm::indicateProgress('Installing package: ' . ConsoleColor::yellow($package->getName()));
+                    InteractiveTerm::indicateProgress('Installing ' . $this->kindLabel($package) . ': ' . ConsoleColor::yellow($package->getName()));
                }
                try {
                    // Start tracking for binary installation
@@ -234,17 +230,17 @@ class PackageInstaller
                    // Stop tracking on error
                    $this->tracker?->stopTracking();
                    if ($this->interactive) {
-                        InteractiveTerm::finish('Installing binary package failed: ' . ConsoleColor::red($package->getName()), false);
+                        InteractiveTerm::finish('Installing ' . $this->kindLabel($package) . ' failed: ' . ConsoleColor::red($package->getName()), false);
                        echo PHP_EOL;
                    }
                    throw $e;
                }
                if ($this->interactive) {
-                    InteractiveTerm::finish('Installed binary package: ' . ConsoleColor::green($package->getName()) . ($status === SPC_STATUS_ALREADY_INSTALLED ? ' (already installed, skipped)' : ''));
+                    InteractiveTerm::finish('Installed ' . $this->kindLabel($package) . ': ' . ConsoleColor::green($package->getName()) . ($status === SPC_STATUS_ALREADY_INSTALLED ? ' (already installed, skipped)' : ''));
                }
            } elseif ($is_to_build && $has_build_stage || $has_source && $has_build_stage) {
                if ($this->interactive) {
-                    InteractiveTerm::indicateProgress('Building package: ' . ConsoleColor::yellow($package->getName()));
+                    InteractiveTerm::indicateProgress('Building ' . $this->kindLabel($package) . ': ' . ConsoleColor::yellow($package->getName()));
                }
                try {
                    // Start tracking for build
@@ -267,13 +263,13 @@ class PackageInstaller
                    // Stop tracking on error
                    $this->tracker?->stopTracking();
                    if ($this->interactive) {
-                        InteractiveTerm::finish('Building package failed: ' . ConsoleColor::red($package->getName()), false);
+                        InteractiveTerm::finish('Building ' . $this->kindLabel($package) . ' failed: ' . ConsoleColor::red($package->getName()), false);
                        echo PHP_EOL;
                    }
                    throw $e;
                }
                if ($this->interactive) {
-                    InteractiveTerm::finish('Built package: ' . ConsoleColor::green($package->getName()) . ($status === SPC_STATUS_ALREADY_BUILT ? ' (already built, skipped)' : ''));
+                    InteractiveTerm::finish('Built ' . $this->kindLabel($package) . ': ' . ConsoleColor::green($package->getName()) . ($status === SPC_STATUS_ALREADY_BUILT ? ' (already built, skipped)' : ''));
                }
            }
        }
@@ -366,6 +362,15 @@ class PackageInstaller
        return false;
    }

+    public function emitPreInstallEvents(): void
+    {
+        foreach ($this->packages as $package) {
+            if ($package->hasStage('preInstall')) {
+                $package->runStage('preInstall');
+            }
+        }
+    }
+
    public function emitPostInstallEvents(): void
    {
        foreach ($this->packages as $package) {
@@ -578,64 +583,75 @@ class PackageInstaller
        return null;
    }

-    /**
-     * Collect all tool packages required by the currently resolved packages.
-     *
-     * Reads the 'tools' field from each resolved package's YAML config.
-     * The field supports platform suffixes (tools@windows, tools@linux, etc.)
-     * resolved automatically by PackageConfig::get().
-     *
-     * Tools are NOT part of the library dependency graph — they are
-     * build-time prerequisites that must be installed before any library
-     * build begins.
-     *
-     * @return string[] Unique tool package names required for this build
-     */
-    public function collectRequiredTools(): array
+    private function reconcilePhpSrcVersion(): void
    {
-        $tools = [];
-        foreach ($this->packages as $package) {
-            $deps = PackageConfig::get($package->getName(), 'tools', []);
-            foreach ((array) $deps as $tool_name) {
-                $tools[$tool_name] = true;
+        $src_dir = SOURCE_PATH . '/php-src';
+        $cache = ApplicationContext::get(ArtifactCache::class);
+        $requested = $this->options['dl-with-php'] ?? null;
+        if ($requested !== null && $requested !== '' && $requested !== 'git') {
+            $info = $cache->getSourceInfo('php-src') ?? [];
+            $cv = $info['version'] ?? null;
+            if (($info['cache_type'] ?? null) === 'git' || $cv === null
+                || ($cv !== $requested && !str_starts_with($cv, $requested . '.'))) {
+                $resolved = null;
+                $candidates = glob(DOWNLOAD_PATH . '/php-' . $requested . '.*.tar.xz') ?: [];
+                if ($candidates !== []) {
+                    usort($candidates, 'strnatcmp');
+                    if (preg_match('/^php-([0-9.]+)\.tar\.xz$/', basename(end($candidates)), $vm)) {
+                        $resolved = $vm[1];
+                    }
+                } elseif ($this->download) {
+                    $j = @file_get_contents('https://www.php.net/releases/index.php?json&version=' . urlencode($requested));
+                    $rel = is_string($j) ? json_decode($j, true) : null;
+                    $resolved = is_array($rel) ? ($rel['version'] ?? null) : null;
+                } else {
+                    throw new WrongUsageException("Requested PHP '{$requested}' but no php-{$requested}.*.tar.xz in downloads/; drop --no-download or run 'bin/spc download php-src --with-php={$requested}' first.");
+                }
+                if ($resolved !== null) {
+                    $cf = DOWNLOAD_PATH . '/.cache.json';
+                    $j = json_decode(@file_get_contents($cf) ?: '{}', true) ?: [];
+                    $tarball = DOWNLOAD_PATH . "/php-{$resolved}.tar.xz";
+                    $j['php-src']['source'] = [
+                        'lock_type' => 'source', 'cache_type' => 'archive',
+                        'filename' => "php-{$resolved}.tar.xz",
+                        'extract' => $info['extract'] ?? null,
+                        'hash' => is_file($tarball) ? sha1_file($tarball) : null,
+                        'time' => time(), 'version' => $resolved,
+                        'config' => $info['config'] ?? ['type' => 'php-release', 'domain' => 'https://www.php.net'],
+                        'downloader' => $info['downloader'] ?? \StaticPHP\Artifact\Downloader\Type\PhpRelease::class,
+                    ];
+                    $j['php-src']['binary'] ??= [];
+                    file_put_contents($cf, json_encode($j, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+                    ApplicationContext::set(ArtifactCache::class, $cache = new ArtifactCache());
+                }
            }
        }
-        return array_keys($tools);
+        if (!is_dir($src_dir) || ($info = $cache->getSourceInfo('php-src')) === null) {
+            return;
+        }
+        if (($info['cache_type'] ?? null) === 'git') {
+            if (!is_dir($src_dir . '/.git')) {
+                FileSystem::removeDir($src_dir);
+            }
+            return;
+        }
+        $vh = $src_dir . '/main/php_version.h';
+        if (is_file($vh)
+            && preg_match('/#define\s+PHP_VERSION\s+"([^"]+)"/', file_get_contents($vh), $m)
+            && $m[1] !== ($info['version'] ?? null)
+        ) {
+            FileSystem::removeDir($src_dir);
+        }
    }

-    /**
-     * Check that all required tools are installed.
-     *
-     * Iterates through tools collected by collectRequiredTools(),
-     * resolves each to a ToolPackage instance, and checks isInstalled().
-     *
-     * @return array{missing: array<string>, installed: array<string>}
-     */
-    public function checkRequiredTools(): array
+    private function kindLabel(Package $package): string
    {
-        $missing = [];
-        $installed = [];
-        foreach ($this->collectRequiredTools() as $tool_name) {
-            try {
-                $tool = PackageLoader::getPackage($tool_name);
-            } catch (WrongUsageException) {
-                $missing[] = $tool_name;
-                logger()->warning("Required tool '{$tool_name}' is not registered as a package.");
-                continue;
-            }
-
-            if (!$tool instanceof ToolPackage) {
-                logger()->warning("Package '{$tool_name}' is declared as a tool dependency but is not a ToolPackage (type: {$tool->getType()}).");
-                continue;
-            }
-
-            if ($tool->isInstalled()) {
-                $installed[] = $tool_name;
-            } else {
-                $missing[] = $tool_name;
-            }
-        }
-        return ['missing' => $missing, 'installed' => $installed];
+        return match (true) {
+            $package instanceof PhpExtensionPackage => 'extension',
+            $package instanceof TargetPackage => 'target',
+            $package instanceof LibraryPackage => 'library',
+            default => 'package',
+        };
    }

    /**
@@ -700,27 +716,6 @@ class PackageInstaller
        }
    }

-    /**
-     * Ensure all required tools are installed, throwing if any are missing.
-     *
-     * Called early in the build pipeline (before download/extract).
-     * When tools are missing, lists them with install hints.
-     */
-    private function ensureRequiredTools(): void
-    {
-        $status = $this->checkRequiredTools();
-        if (empty($status['missing'])) {
-            if (!empty($status['installed'])) {
-                logger()->info('Required tools: ' . implode(', ', $status['installed']) . ' — all installed.');
-            }
-            return;
-        }
-
-        $msg = 'Missing required build tools: ' . implode(', ', $status['missing']) . "\n";
-        $msg .= "Run 'bin/spc doctor' to check your environment, or install the missing tools manually.";
-        throw new EnvironmentException($msg);
-    }
-
    private function injectPackageEnvs(Package $package): void
    {
        $name = $package->getName();
@@ -776,7 +771,7 @@ class PackageInstaller
            if ($package->getBuildOption('build-all') || $package->getBuildOption('build-frankenphp')) {
                $frankenphp = PackageLoader::getPackage('frankenphp');
                $this->install_packages[$frankenphp->getName()] = $frankenphp;
-                $this->build_packages[$package->getName()] = $package;
+                $this->build_packages[$frankenphp->getName()] = $frankenphp;
                $added = true;
            }
            $this->build_packages[$package->getName()] = $package;
--- a/src/StaticPHP/Package/PhpExtensionPackage.php
+++ b/src/StaticPHP/Package/PhpExtensionPackage.php
@@ -12,6 +12,7 @@ use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\ToolchainManager;
 use StaticPHP\Toolchain\ZigToolchain;
+use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\SPCConfigUtil;

@@ -278,10 +279,15 @@ class PhpExtensionPackage extends Package
        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+        // -Wl,-Bsymbolic: bind zend_* refs to the .so's own copies, not via global lookup
+        $ldflags = (string) $config['ldflags'];
+        if (PHP_OS_FAMILY !== 'Darwin' && !str_contains($ldflags, '-Wl,-Bsymbolic')) {
+            $ldflags = clean_spaces($ldflags . ' -Wl,-Bsymbolic');
+        }
        return [
            'CFLAGS' => $config['cflags'],
-            'CXXFLAGS' => $config['cflags'],
-            'LDFLAGS' => $config['ldflags'],
+            'CXXFLAGS' => $config['cxxflags'],
+            'LDFLAGS' => $ldflags,
            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
        ];
@@ -303,6 +309,7 @@ class PhpExtensionPackage extends Package
    public function configureForUnix(array $env, PhpExtensionPackage $package): void
    {
        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+        // CustomPhpConfigureArg keys are OS names ('Linux'/'Darwin'), not platform strings
        shell()->cd($package->getSourceDir())
            ->setEnv($env)
            ->exec(
@@ -318,11 +325,53 @@ class PhpExtensionPackage extends Package
    #[Stage]
    public function makeForUnix(array $env, PhpExtensionPackage $package, PackageBuilder $builder): void
    {
+        // phpize Makefile's _SHARED_LIBADD line misses our static archives — splice them in
+        $package->patchSharedLibAdd();
+        $extra_ldflags = (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS');
+        $makeArgs = $extra_ldflags !== '' ? 'EXTRA_LDFLAGS=' . escapeshellarg($extra_ldflags) : '';
        shell()->cd($package->getSourceDir())
            ->setEnv($env)
            ->exec('make clean')
-            ->exec("make -j{$builder->concurrency}")
-            ->exec('make install');
+            ->exec("make -j{$builder->concurrency} {$makeArgs}")
+            ->exec("make install {$makeArgs}");
+
+        // install-modules deref'd libtool's `$ext.so → $ext-X.so` symlink into two regular files; restore the symlink.
+        if (preg_match('/-release\s+(\S+)/', $extra_ldflags, $m)) {
+            $name = $package->getExtensionName();
+            $unversioned = BUILD_MODULES_PATH . "/{$name}.so";
+            $versioned = BUILD_MODULES_PATH . "/{$name}-{$m[1]}.so";
+            if (file_exists($versioned) && file_exists($unversioned) && !is_link($unversioned)) {
+                unlink($unversioned);
+                symlink(basename($versioned), $unversioned);
+            }
+        }
+    }
+
+    public function patchSharedLibAdd(): void
+    {
+        $config = new SPCConfigUtil()->getExtensionConfig($this);
+        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a')
+            ? '-l:libstdc++.a'
+            : (str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '');
+
+        $makefile = $this->getSourceDir() . '/Makefile';
+        if (!is_file($makefile)) {
+            return;
+        }
+        $content = (string) file_get_contents($makefile);
+        if (!preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $content, $m)) {
+            return;
+        }
+        $prefix = $m[1];
+        $current = trim($m[2]);
+        $merged = clean_spaces("{$current} {$staticLibs} {$lstdcpp}");
+        $merged = deduplicate_flags($merged);
+        FileSystem::replaceFileRegex(
+            $makefile,
+            '/^(.*_SHARED_LIBADD\s*=.*)$/m',
+            $prefix . $merged
+        );
    }

    /**
@@ -333,14 +382,31 @@ class PhpExtensionPackage extends Package
     */
    public function buildSharedForUnix(PackageBuilder $builder): void
    {
+        // skip virtual addons (arg-type=none + display-name → owning ext); the parent ext built it
+        $argType = $this->extension_config['arg-type'] ?? null;
+        $displayName = $this->extension_config['display-name'] ?? null;
+        if ($argType === 'none' && $displayName !== null && $displayName !== $this->getExtensionName()) {
+            logger()->info("Skipping virtual extension [{$this->getName()}] — it's part of [{$displayName}].");
+            return;
+        }
+
+        if (!is_dir($this->getSourceDir())) {
+            throw new ValidationException(
+                "Extension source directory not found: {$this->getSourceDir()}",
+                validation_module: "Extension {$this->getName()} source"
+            );
+        }
+
        $env = $this->getSharedExtensionEnv();

        $this->runStage([$this, 'phpizeForUnix'], ['env' => $env]);
        $this->runStage([$this, 'configureForUnix'], ['env' => $env]);
        $this->runStage([$this, 'makeForUnix'], ['env' => $env]);

-        // process *.so file
-        $soFile = BUILD_MODULES_PATH . '/' . $this->getExtensionName() . '.so';
+        // libtool's -release X gives $name-X.so as the real file
+        $soFile = BUILD_MODULES_PATH . '/' . $this->getExtensionName()
+            . (preg_match('/-release\s+(\S+)/', (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $m) ? "-{$m[1]}" : '')
+            . '.so';
        if (!file_exists($soFile)) {
            throw new ValidationException("Extension {$this->getExtensionName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getExtensionName()} build");
        }
--- a/src/StaticPHP/Package/ToolPackage.php
+++ b/src/StaticPHP/Package/ToolPackage.php
@@ -1,151 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Package;
-
-use StaticPHP\Config\PackageConfig;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalPathTrait;
-
-/**
- * Represents a build-time tool package.
- *
- * Tool packages are NOT link-time dependencies. They provide executables
- * that are needed during the build process (compilers, code generators,
- * assemblers, etc.) and are installed into PKG_ROOT_PATH.
- *
- * Tool packages do NOT produce static-libs, headers, or pkg-config files.
- * They are resolved and installed independently from the library dependency graph.
- *
- * YAML config schema (config/pkg/tool/<name>.yml):
- *
- *   nasm:
- *     type: tool
- *     tool:
- *       provides: [nasm.exe, ndisasm.exe]       # executables this tool installs
- *       binary-subdir: ''                        # subdirectory under install root (default: '')
- *       min-version: '2.16'                      # minimum required version (optional)
- *     artifact:
- *       binary:
- *         windows-x86_64:
- *           type: url
- *           url: 'https://...'
- *           extract:
- *             nasm.exe: '{php_sdk_path}/bin/nasm.exe'
- */
-class ToolPackage extends Package
-{
-    use GlobalPathTrait;
-
-    /**
-     * Get the install root directory for this tool.
-     *
-     * Defaults to PKG_ROOT_PATH. Override via 'tool.install-root' in YAML
-     * or via the TOOL_INSTALL_ROOT_{NAME} environment variable.
-     */
-    public function getInstallRoot(): string
-    {
-        $env_var = 'TOOL_INSTALL_ROOT_' . strtoupper(str_replace('-', '_', $this->name));
-        if ($root = getenv($env_var)) {
-            return $root;
-        }
-        $config_root = $this->getToolConfig()['install-root'] ?? null;
-        if ($config_root !== null) {
-            return FileSystem::replacePathVariable((string) $config_root);
-        }
-        return PKG_ROOT_PATH;
-    }
-
-    /**
-     * Get the directory where this tool's binaries reside.
-     *
-     * This is {install-root}/{binary-subdir}. If binary-subdir is not
-     * configured, returns the install root directly.
-     */
-    public function getBinaryDir(): string
-    {
-        $subdir = $this->getToolConfig()['binary-subdir'] ?? '';
-        if ($subdir === '') {
-            return $this->getInstallRoot();
-        }
-        return $this->getInstallRoot() . DIRECTORY_SEPARATOR . $subdir;
-    }
-
-    /**
-     * Get the list of executables this tool provides.
-     *
-     * Reads from YAML 'tool.provides' field. Each entry is a bare filename
-     * (e.g. 'nasm.exe'), resolved relative to getBinaryDir().
-     *
-     * @return string[] Bare executable names (not full paths)
-     */
-    public function getProvides(): array
-    {
-        return $this->getToolConfig()['provides'] ?? [];
-    }
-
-    /**
-     * Get the full path to a specific binary provided by this tool.
-     *
-     * @param  string $name Bare executable name (must be listed in tool.provides).
-     *                      If empty, defaults to the first entry in provides.
-     * @return string Full absolute path to the binary
-     */
-    public function getBinary(string $name = ''): string
-    {
-        $provides = $this->getProvides();
-        if ($name === '') {
-            $name = $provides[0] ?? throw new \RuntimeException("Tool '{$this->name}' has no 'tool.provides' configured.");
-        }
-        if (!in_array($name, $provides, true)) {
-            throw new \RuntimeException("Binary '{$name}' is not listed in tool.provides for '{$this->name}'. Available: " . implode(', ', $provides));
-        }
-        return $this->getBinaryDir() . DIRECTORY_SEPARATOR . $name;
-    }
-
-    /**
-     * Check whether this tool is installed (all provided binaries exist on disk).
-     */
-    public function isInstalled(): bool
-    {
-        return array_all($this->getProvides(), fn ($binary) => file_exists($this->getBinary($binary)));
-    }
-
-    /**
-     * Get the minimum required version for this tool, if specified.
-     *
-     * Returns null if no version constraint is configured.
-     */
-    public function getMinVersion(): ?string
-    {
-        $version = $this->getToolConfig()['min-version'] ?? null;
-        return $version !== null ? (string) $version : null;
-    }
-
-    /**
-     * Tools install to PKG_ROOT_PATH (or the configured install-root),
-     * not BUILD_ROOT_PATH.
-     */
-    public function getInstallTarget(): string
-    {
-        return $this->getBinaryDir();
-    }
-
-    /**
-     * Get the 'tool' sub-config for this package.
-     *
-     * Returns the nested array under the 'tool' key in the package YAML,
-     * or an empty array if not configured.
-     *
-     * @return array<string, mixed>
-     */
-    private function getToolConfig(): array
-    {
-        $config = PackageConfig::get($this->name);
-        if (!is_array($config) || !isset($config['tool']) || !is_array($config['tool'])) {
-            return [];
-        }
-        return $config['tool'];
-    }
-}
--- a/src/StaticPHP/Registry/ArtifactLoader.php
+++ b/src/StaticPHP/Registry/ArtifactLoader.php
@@ -36,6 +36,13 @@ class ArtifactLoader
    public static function getArtifactInstance(string $artifact_name): ?Artifact
    {
        self::initArtifactInstances();
+        if (!isset(self::$artifacts[$artifact_name])) {
+            // Artifact may have been registered after initArtifactInstances() ran (e.g., from a vendor registry)
+            $config = ArtifactConfig::get($artifact_name);
+            if ($config !== null) {
+                self::$artifacts[$artifact_name] = new Artifact($artifact_name, $config);
+            }
+        }
        return self::$artifacts[$artifact_name] ?? null;
    }

--- a/src/StaticPHP/Registry/PackageLoader.php
+++ b/src/StaticPHP/Registry/PackageLoader.php
@@ -17,7 +17,6 @@ use StaticPHP\Attribute\Package\PatchBeforeBuild;
 use StaticPHP\Attribute\Package\ResolveBuild;
 use StaticPHP\Attribute\Package\Stage;
 use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Attribute\Package\Tool;
 use StaticPHP\Attribute\Package\Validate;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
@@ -28,7 +27,6 @@ use StaticPHP\Package\Package;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Package\TargetPackage;
-use StaticPHP\Package\ToolPackage;
 use StaticPHP\Util\FileSystem;

 class PackageLoader
@@ -90,7 +88,6 @@ class PackageLoader
                'target', 'virtual-target' => new TargetPackage($name, $item['type']),
                'library' => new LibraryPackage($name, $item['type']),
                'php-extension' => new PhpExtensionPackage($name, $item['type']),
-                'tool' => new ToolPackage($name, $item['type']),
                default => null,
            };
            if ($pkg !== null) {
@@ -193,8 +190,7 @@ class PackageLoader
            $attribute_instance = $attribute->newInstance();
            if ($attribute_instance instanceof Target === false &&
                $attribute_instance instanceof Library === false &&
-                $attribute_instance instanceof Extension === false &&
-                $attribute_instance instanceof Tool === false) {
+                $attribute_instance instanceof Extension === false) {
                // not a package attribute
                continue;
            }
@@ -220,7 +216,6 @@ class PackageLoader
                Target::class => ['target', 'virtual-target'],
                Library::class => ['library'],
                Extension::class => ['php-extension'],
-                Tool::class => ['tool'],
                default => null,
            };
            if (!in_array($package_type, $pkg_type_attr, true)) {
@@ -372,18 +367,18 @@ class PackageLoader

    public static function getBeforeStageCallbacks(string $package_name, string $stage): iterable
    {
-        // match condition
+        // match condition; '*' is a wildcard that fires for every package's stage
        $installer = ApplicationContext::get(PackageInstaller::class);
-        $stages = self::$before_stages[$package_name][$stage] ?? [];
-        foreach ($stages as $entry) {
-            $callback = $entry[0];
-            $only_when_package_resolved = $entry[1] ?? null;
-            $conditionals = $entry[2] ?? [];
+        $stages = array_merge(
+            self::$before_stages[$package_name][$stage] ?? [],
+            $package_name === '*' ? [] : (self::$before_stages['*'][$stage] ?? []),
+        );
+        foreach ($stages as [$callback, $only_when_package_resolved, $conditionals]) {
            if ($only_when_package_resolved !== null && !$installer->isPackageResolved($only_when_package_resolved)) {
                continue;
            }
            foreach ($conditionals as $class) {
-                if (!ApplicationContext::has($class)) {
+                if (ApplicationContext::tryGet($class) === null) {
                    continue 2;
                }
            }
@@ -393,19 +388,19 @@ class PackageLoader

    public static function getAfterStageCallbacks(string $package_name, string $stage): array
    {
-        // match condition
+        // match condition; '*' is a wildcard that fires for every package's stage
        $installer = ApplicationContext::get(PackageInstaller::class);
-        $stages = self::$after_stages[$package_name][$stage] ?? [];
+        $stages = array_merge(
+            self::$after_stages[$package_name][$stage] ?? [],
+            $package_name === '*' ? [] : (self::$after_stages['*'][$stage] ?? []),
+        );
        $result = [];
-        foreach ($stages as $entry) {
-            $callback = $entry[0];
-            $only_when_package_resolved = $entry[1] ?? null;
-            $conditionals = $entry[2] ?? [];
+        foreach ($stages as [$callback, $only_when_package_resolved, $conditionals]) {
            if ($only_when_package_resolved !== null && !$installer->isPackageResolved($only_when_package_resolved)) {
                continue;
            }
            foreach ($conditionals as $class) {
-                if (!ApplicationContext::has($class)) {
+                if (ApplicationContext::tryGet($class) === null) {
                    continue 2;
                }
            }
@@ -436,6 +431,20 @@ class PackageLoader
    {
        foreach (['BeforeStage' => self::$before_stages, 'AfterStage' => self::$after_stages] as $event_name => $ev_all) {
            foreach ($ev_all as $package_name => $stages) {
+                // wildcard hooks fire for every package's stage; nothing to validate against
+                if ($package_name === '*') {
+                    foreach ($stages as $stage_name => $before_events) {
+                        foreach ($before_events as [$event_callable, $only_when_package_resolved, $conditionals]) {
+                            if ($only_when_package_resolved !== null && !self::hasPackage($only_when_package_resolved)) {
+                                throw new RegistryException("{$event_name} event for wildcard [*] stage [{$stage_name}] has unknown only_when_package_resolved package [{$only_when_package_resolved}].");
+                            }
+                            if (!is_callable($event_callable)) {
+                                throw new RegistryException("{$event_name} event for wildcard [*] stage [{$stage_name}] has invalid callable.");
+                            }
+                        }
+                    }
+                    continue;
+                }
                // check package exists
                if (!self::hasPackage($package_name)) {
                    throw new RegistryException(
@@ -444,9 +453,7 @@ class PackageLoader
                }
                $pkg = self::getPackage($package_name);
                foreach ($stages as $stage_name => $before_events) {
-                    foreach ($before_events as $entry) {
-                        $event_callable = $entry[0];
-                        $only_when_package_resolved = $entry[1] ?? null;
+                    foreach ($before_events as [$event_callable, $only_when_package_resolved, $conditionals]) {
                        // check only_when_package_resolved package exists
                        if ($only_when_package_resolved !== null && !self::hasPackage($only_when_package_resolved)) {
                            throw new RegistryException("{$event_name} event in package [{$package_name}] for stage [{$stage_name}] has unknown only_when_package_resolved package [{$only_when_package_resolved}].");
--- a/src/StaticPHP/Registry/Registry.php
+++ b/src/StaticPHP/Registry/Registry.php
@@ -89,14 +89,19 @@ class Registry
        self::$current_registry_name = $registry_name;

        try {
-            // Load composer autoload if specified (for external registries with their own dependencies)
+            // resolve autoload manually — path-repo installs have no vendor/, FileSystem::fullpath would throw
            if (isset($data['autoload']) && is_string($data['autoload'])) {
-                $autoload_path = FileSystem::fullpath($data['autoload'], dirname($registry_file));
+                $base = dirname($registry_file);
+                $autoload_path = FileSystem::isRelativePath($data['autoload'])
+                    ? rtrim($base, '/') . DIRECTORY_SEPARATOR . $data['autoload']
+                    : $data['autoload'];
                if (file_exists($autoload_path)) {
                    logger()->debug("Loading external autoload from: {$autoload_path}");
                    require_once $autoload_path;
+                } elseif (str_contains(rtrim(FileSystem::convertPath($base), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR)) {
+                    logger()->debug("Registry autoload not present, relying on consumer autoloader: {$autoload_path}");
                } else {
-                    logger()->warning("Autoload file not found: {$autoload_path}");
+                    throw new RegistryException("Path does not exist: {$autoload_path}");
                }
            }

--- a/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php
+++ b/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php
@@ -11,6 +11,7 @@ use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Package\PackageBuilder;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Runtime\Shell\UnixShell;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\InteractiveTerm;
 use ZM\Logger\ConsoleColor;

@@ -117,7 +118,7 @@ class UnixAutoconfExecutor extends Executor
    /**
     * Add configure args.
     */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
    {
        $this->configure_args = [...$this->configure_args, ...$args];
        return $this;
@@ -126,7 +127,7 @@ class UnixAutoconfExecutor extends Executor
    /**
     * Remove some configure args, to bypass the configure option checking for some libs.
     */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
    {
        $this->configure_args = array_diff($this->configure_args, $args);
        return $this;
@@ -149,13 +150,17 @@ class UnixAutoconfExecutor extends Executor
     */
    private function getDefaultConfigureArgs(): array
    {
-        return [
+        $args = [
            '--disable-shared',
            '--enable-static',
            "--prefix={$this->package->getBuildRootPath()}",
            '--with-pic',
            '--enable-pic',
        ];
+        if ($host_triple = SystemTarget::getAutoconfHostTriple()) {
+            $args[] = "--host={$host_triple}";
+        }
+        return $args;
    }

    /**
--- a/src/StaticPHP/Runtime/Executor/UnixCMakeExecutor.php
+++ b/src/StaticPHP/Runtime/Executor/UnixCMakeExecutor.php
@@ -135,7 +135,7 @@ class UnixCMakeExecutor extends Executor
    /**
     * Add configure args.
     */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
    {
        $this->configure_args = [...$this->configure_args, ...$args];
        return $this;
@@ -144,7 +144,7 @@ class UnixCMakeExecutor extends Executor
    /**
     * Remove some configure args, to bypass the configure option checking for some libs.
     */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
    {
        $this->ignore_args = [...$this->ignore_args, ...$args];
        return $this;
--- a/src/StaticPHP/Runtime/Executor/WindowsCMakeExecutor.php
+++ b/src/StaticPHP/Runtime/Executor/WindowsCMakeExecutor.php
@@ -99,7 +99,7 @@ class WindowsCMakeExecutor extends Executor
    /**
     * Add configure args.
     */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
    {
        $this->configure_args = [...$this->configure_args, ...$args];
        return $this;
@@ -108,7 +108,7 @@ class WindowsCMakeExecutor extends Executor
    /**
     * Remove some configure args, to bypass the configure option checking for some libs.
     */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
    {
        $this->ignore_args = [...$this->ignore_args, ...$args];
        return $this;
@@ -189,10 +189,6 @@ class WindowsCMakeExecutor extends Executor
    {
        return $this->custom_default_args ?? [
            '-A x64',
-            // CMake 4.x hard-errors on projects requesting compatibility with CMake < 3.5
-            // (e.g. wineditline). This is the documented escape hatch; modern projects and
-            // older CMake releases ignore it.
-            '-DCMAKE_POLICY_VERSION_MINIMUM=3.5',
            '-DCMAKE_BUILD_TYPE=Release',
            '-DBUILD_SHARED_LIBS=OFF',
            '-DBUILD_STATIC_LIBS=ON',
--- a/src/StaticPHP/Runtime/Shell/DefaultShell.php
+++ b/src/StaticPHP/Runtime/Shell/DefaultShell.php
@@ -184,14 +184,12 @@ class DefaultShell extends Shell
     */
    public function execute7zExtract(string $archive_path, string $target_path): bool
    {
-        // 7za.exe is installed by the 7za-win target package into PKG_ROOT_PATH\bin,
-        // which is added to PATH by MSVCToolchain::initEnv().
-        $_7z_path = FileSystem::convertPath(PKG_ROOT_PATH . '\bin\7za.exe');
-        if (!file_exists($_7z_path)) {
-            throw new SPCInternalException('7za.exe not found. Please install the 7za-win target package.');
+        $sdk_path = getenv('PHP_SDK_PATH');
+        if ($sdk_path === false) {
+            throw new SPCInternalException('PHP_SDK_PATH environment variable is not set');
        }

-        $_7z = escapeshellarg(FileSystem::convertPath($_7z_path));
+        $_7z = escapeshellarg(FileSystem::convertPath($sdk_path . '/bin/7za.exe'));
        $archive_arg = escapeshellarg(FileSystem::convertPath($archive_path));
        $target_arg = escapeshellarg(FileSystem::convertPath($target_path));

--- a/src/StaticPHP/Runtime/SystemTarget.php
+++ b/src/StaticPHP/Runtime/SystemTarget.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace StaticPHP\Runtime;

+use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\System\LinuxUtil;

 /**
@@ -16,7 +17,7 @@ class SystemTarget
     */
    public static function getLibc(): ?string
    {
-        if ($target = getenv('SPC_TARGET')) {
+        if ($target = self::target()) {
            if (str_contains($target, '-gnu')) {
                return 'glibc';
            }
@@ -57,7 +58,7 @@ class SystemTarget
    public static function getLibcVersion(): ?string
    {
        if (PHP_OS_FAMILY === 'Linux') {
-            $target = (string) getenv('SPC_TARGET');
+            $target = self::target();
            if (str_contains($target, '-gnu.2.')) {
                return preg_match('/-gnu\.(2\.\d+)/', $target, $matches) ? $matches[1] : null;
            }
@@ -75,7 +76,7 @@ class SystemTarget
     */
    public static function getTargetOS(): string
    {
-        $target = (string) getenv('SPC_TARGET');
+        $target = self::target();
        return match (true) {
            str_contains($target, '-linux') => 'Linux',
            str_contains($target, '-macos') => 'Darwin',
@@ -91,7 +92,7 @@ class SystemTarget
     */
    public static function getTargetArch(): string
    {
-        $target = (string) getenv('SPC_TARGET');
+        $target = self::target();
        return match (true) {
            str_contains($target, 'x86_64') || str_contains($target, 'amd64') => 'x86_64',
            str_contains($target, 'aarch64') || str_contains($target, 'arm64') => 'aarch64',
@@ -127,4 +128,70 @@ class SystemTarget
    {
        return in_array(self::getTargetOS(), ['Linux', 'Darwin', 'BSD']);
    }
+
+    /**
+     * Returns the canonical target triple (arch-os-abi) for per-target build
+     * artifacts. Always returns a non-null triple, falling back to a host-derived
+     * triple when SPC_TARGET is unset or names 'native'.
+     * Strips libc version suffix (-gnu.2.17 → -gnu) and trailing flags (' -dynamic').
+     */
+    public static function getCanonicalTriple(): string
+    {
+        $target = self::target();
+        if ($target !== '' && !str_contains($target, 'native')) {
+            $cleaned = (string) preg_replace('/(-gnu|-musl)\.[\d.]+/', '$1', $target);
+            $cleaned = preg_split('/\s+/', trim($cleaned))[0] ?? '';
+            if ($cleaned !== '') {
+                return $cleaned;
+            }
+        }
+        $arch = self::getTargetArch();
+        return match (self::getTargetOS()) {
+            'Linux' => $arch . '-linux-' . (self::getLibc() === 'musl' ? 'musl' : 'gnu'),
+            'Darwin' => $arch . '-macos-none',
+            'Windows' => $arch . '-windows-gnu',
+            default => $arch . '-unknown-unknown',
+        };
+    }
+
+    /**
+     * Returns a GNU host triple for autoconf --host= when SPC_TARGET names an
+     * architecture different from the build host (true cross-compile).
+     * Returns null for same-arch builds.
+     * Strips libc version suffix (-gnu.2.17 → -gnu) and trailing flags (e.g. ' -dynamic').
+     */
+    public static function getAutoconfHostTriple(): ?string
+    {
+        $target = self::target();
+        if ($target === '' || str_contains($target, 'native')) {
+            return null;
+        }
+        $cleaned = preg_split('/\s+/', trim((string) preg_replace('/(-gnu|-musl)\.[\d.]+/', '$1', $target)))[0];
+        if ($cleaned === '') {
+            return null;
+        }
+        // Only emit --host for true cross-arch builds; same-arch (incl. cross-libc) lets autoconf detect.
+        $target_arch_token = explode('-', $cleaned)[0];
+        $arch_aliases = [
+            'x86_64' => ['x86_64', 'amd64'],
+            'aarch64' => ['aarch64', 'arm64'],
+            'arm' => ['arm', 'armv6', 'armv7', 'armhf', 'armel'],
+            'i386' => ['i386', 'i486', 'i586', 'i686'],
+        ];
+        $host_arch = GNU_ARCH;
+        if (array_any($arch_aliases, fn ($aliases) => in_array($target_arch_token, $aliases, true) && in_array($host_arch, $aliases, true))) {
+            return null;
+        }
+        return $cleaned;
+    }
+
+    /** native toolchains ignore SPC_TARGET */
+    private static function target(): string
+    {
+        $tc = (string) getenv('SPC_TOOLCHAIN');
+        if ($tc !== '' && $tc !== ZigToolchain::class) {
+            return '';
+        }
+        return (string) getenv('SPC_TARGET');
+    }
 }
--- a/src/StaticPHP/Toolchain/ClangPortsToolchain.php
+++ b/src/StaticPHP/Toolchain/ClangPortsToolchain.php
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Toolchain;
-
-use StaticPHP\Util\GlobalEnvManager;
-
-class ClangPortsToolchain extends ClangNativeToolchain
-{
-    public function initEnv(): void
-    {
-        $macports_prefix = getenv('MACPORTS_PREFIX') ?: '/opt/local';
-        GlobalEnvManager::putenv("SPC_DEFAULT_CC={$macports_prefix}/bin/clang");
-        GlobalEnvManager::putenv("SPC_DEFAULT_CXX={$macports_prefix}/bin/clang++");
-        GlobalEnvManager::putenv("SPC_DEFAULT_AR={$macports_prefix}/bin/llvm-ar");
-        GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
-        GlobalEnvManager::addPathIfNotExists("{$macports_prefix}/bin");
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
henderkes	3b8abda8c9	add libclang.cpu.a	2026-06-09 12:27:58 +07:00
henderkes	5747a5661e	build shared extensions before frankenphp	2026-06-02 04:00:57 +00:00
henderkes	d52ba59edc	fix SourcePatcher::patchHardcodedINI method signature	2026-05-30 09:08:49 +07:00
henderkes	2d5abd31c1	micro patch for cross-arch 32 bit builds	2026-05-29 23:15:53 +07:00
henderkes	69d0f9b8cc	remove SPC_ARCH	2026-05-29 22:38:58 +07:00
henderkes	d846db2ef2	forward v2 fix	2026-05-26 00:51:16 +00:00
henderkes	f06891155c	revert	2026-05-24 21:42:41 +07:00
henderkes	15deecd34f	Merge remote-tracking branch 'origin/v3' into feat/pgo-v3	2026-05-24 20:26:50 +07:00
henderkes	fe4803cfaf	run shared ext builds after frankenphp build	2026-05-24 12:15:40 +07:00
henderkes	80d81079db	backport v2 passing correct libraries, not all	2026-05-24 12:15:04 +07:00
henderkes	6ab52a5181	cxxflags in spcconfigutil	2026-05-23 20:46:21 +07:00
henderkes	5bdcd3f562	dont pass all static exts to frankenphp build either	2026-05-23 20:02:24 +07:00
henderkes	203fed65d9	dont pass shared extension packages to SPCConfigUtil for building php (bleeds libpq polyfills into php configure, poisoning e.g. have_strlcat results)	2026-05-23 16:17:12 +07:00
henderkes	1ae989df59	simplify common zig code paths	2026-05-23 16:15:12 +07:00
henderkes	e7fb1e203f	backport fixes from v2	2026-05-23 16:15:12 +07:00
Marc	713f8255af	mongodb: export PHP_VERSION_ID for in-tree builds (#1156 )	2026-05-23 07:35:24 +07:00
Luther Monson	3c24c92d61	mongodb: export PHP_VERSION_ID for in-tree builds mongo-php-driver 2.3.3 added a config.m4 check that falls back to php-config when PHP_VERSION_ID is unset in the shell env. In-tree PHP source builds have no php-config, so configure fails with: checking PHP version... configure: error: php-config not found Set PHP_VERSION_ID from main/php_version.h before configureForUnix so the lookup short-circuits.	2026-05-22 10:03:43 -07:00
henderkes	d93fdd9707	use github tokens for package downloads	2026-05-22 23:06:25 +07:00
henderkes	c40d069b0c	address #1155	2026-05-22 23:05:51 +07:00
henderkes	9d508f1d39	forward port v2 pgo changes	2026-05-22 15:42:51 +07:00
crazywhalecc	a23ad55fe2	Add preInstall stage	2026-05-22 14:03:26 +08:00
crazywhalecc	735f12648e	Update discord invite link	2026-05-22 11:23:53 +08:00
Jerry Ma	6fe55a4d6b	Merge branch 'v3' into feat/pgo-v3	2026-05-22 10:27:39 +08:00
Marc	f1525c0ca7	Merge branch 'v3' into feat/pgo-v3	2026-05-20 16:55:02 +07:00
henderkes	433043c0c8	fix macOS	2026-05-19 23:22:52 +07:00
henderkes	b38c7b274f	install runtime rt after zig init	2026-05-19 22:55:01 +07:00
henderkes	efa7946c14	build in SOURCE_PATH	2026-05-19 20:44:47 +07:00
henderkes	7bb4a09a3c	turn llvm-tools into a doctor check. llvm-runtime is a target now	2026-05-19 20:02:13 +07:00
crazywhalecc	3eca044895	Whoops	2026-05-18 12:12:37 +08:00
crazywhalecc	32da708f54	Change gettext-win base to 0.18 (master is 1.0 now)	2026-05-18 12:05:06 +08:00
crazywhalecc	f27ec773a1	Refactor clang runtime bits support for zig integration	2026-05-18 10:55:39 +08:00
crazywhalecc	ce70c0df6a	Register artifacts dynamically if not already initialized	2026-05-18 10:54:32 +08:00
crazywhalecc	fdc75cb9fe	Allow vendor mode loading default registry file	2026-05-18 10:54:17 +08:00
crazywhalecc	697040b918	Trim base namespace for registry	2026-05-18 10:53:55 +08:00
henderkes	19d1379f7d	better cross compile compatibility	2026-05-17 19:52:22 +07:00
henderkes	07aae79cae	forward port #1142	2026-05-16 19:16:24 +07:00
henderkes	4b19f4ec95	forward port #1138	2026-05-15 14:54:04 +07:00
henderkes	1707d21569	don't extract local sources	2026-05-15 14:30:58 +07:00
henderkes	70e717adb6	fix version reevaluating regression from v2	2026-05-15 14:05:33 +07:00
henderkes	a88e426623	clean cgo cache before rebuilding frankenphp (reports wrong version from cgo includes, even if they're updated)	2026-05-15 12:54:05 +07:00
henderkes	6fda358c90	--build-frankenphp didn't actually build frankenphp	2026-05-15 12:36:34 +07:00
henderkes	09de4c9c70	drop ldflags fron watcher-c	2026-05-15 11:05:22 +07:00
henderkes	db794bf27b	strange shit	2026-05-12 13:18:54 +07:00
henderkes	b880ef7003	allow * stage to subscribe to everything	2026-05-12 12:45:09 +07:00
henderkes	9addbe2c7d	oops	2026-05-12 11:41:25 +07:00
henderkes	445c0b36c9	don't add fno-sanitize=undefined for library builds	2026-05-12 11:30:46 +07:00
henderkes	4754faf43e	also build curl exe on windows	2026-05-12 11:24:55 +07:00
henderkes	2415b7db35	we don't need this anymore	2026-05-12 11:22:04 +07:00
henderkes	814014e122	array	2026-05-12 11:19:57 +07:00
henderkes	defd50f459	wrong exception type	2026-05-12 11:17:31 +07:00
henderkes	57ef0423d5	fix phpunit failure	2026-05-12 10:57:49 +07:00
henderkes	8453f69eea	fix BUILD_CC=cc workaround root cause (minijit trips zig default undefined behaviour sanitizer)	2026-05-12 10:52:23 +07:00
henderkes	c1c34d8c10	trust filesystem, not downloads	2026-05-12 10:38:33 +07:00
henderkes	270e2d6471	cant reset it because of the same reason x(	2026-05-12 10:07:21 +07:00
henderkes	4172508cb9	use {pkg_root_path} for packages, otherwise containers get confused with different pkg_root_path set	2026-05-12 09:54:29 +07:00
henderkes	a585359b28	reset registry	2026-05-11 21:36:17 +07:00
henderkes	bfaa7ebb3a	Merge remote-tracking branch 'origin/v3' into feat/pgo-v3	2026-05-11 21:05:54 +07:00
henderkes	7e6e9d869e	add pgo capabilities v3 style	2026-05-11 19:06:40 +07:00
henderkes	743934d1fe	use resolved dependency tree instead of asking for with_suggests everywhere	2026-05-11 11:35:15 +07:00
henderkes	efdd2a74a5	update libraries to honour user flags	2026-05-11 10:05:33 +07:00
henderkes	6e3267273b	better deduplicate_flags	2026-05-11 09:41:25 +07:00
henderkes	4f7694267b	toolchain fixes forward port from v2-pgo	2026-05-10 19:27:36 +07:00