diff --git a/src/Package/Target/php/frankenphp.php b/src/Package/Target/php/frankenphp.php index eed182c7f..d190279b1 100644 --- a/src/Package/Target/php/frankenphp.php +++ b/src/Package/Target/php/frankenphp.php @@ -26,55 +26,6 @@ trait frankenphp { - /** - * Source of the -mthreads stripping shim, see windowsCgoCompilers(). The %s - * placeholder receives the wrapped compiler path as a C string literal. - */ - private const string MTHREADS_SHIM_C = <<<'C' - // Generated by static-php-cli. Drops the MinGW-only -mthreads flag Go passes to - // cgo (golang/go#80290) and forwards everything else to clang. - #include - #include - #include - - static const wchar_t compiler[] = L"%s"; - - int main(void) - { - const wchar_t *args = GetCommandLineW(); - // skip our own (possibly quoted) argv[0] - if (*args == L'"') { - args++; - while (*args && *args != L'"') args++; - if (*args) args++; - } else { - while (*args && *args != L' ' && *args != L'\t') args++; - } - - // "" + args + trailing space so a flag at the very end still matches - size_t len = wcslen(compiler) + wcslen(args) + 8; - wchar_t *cmd = calloc(len, sizeof(wchar_t)); - if (cmd == NULL) return 1; - swprintf(cmd, len, L"\"%%ls\"%%ls ", compiler, args); - - // remove every space-delimited -mthreads token - wchar_t *p; - while ((p = wcsstr(cmd, L" -mthreads ")) != NULL) { - wmemmove(p, p + 10, wcslen(p + 10) + 1); - } - - STARTUPINFOW si = {sizeof(si)}; - PROCESS_INFORMATION pi; - if (!CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) { - return 127; - } - WaitForSingleObject(pi.hProcess, INFINITE); - DWORD code = 1; - GetExitCodeProcess(pi.hProcess, &code); - return (int) code; - } - C; - #[Stage] public function buildFrankenphpForUnix(TargetPackage $package, PackageInstaller $installer, ToolchainInterface $toolchain, PackageBuilder $builder): void { @@ -325,11 +276,10 @@ public function buildFrankenphpForWindows(TargetPackage $package, PackageInstall // Fix: prepend clang's directory to PATH and use plain executable names instead, // which matches FrankenPHP's official CI approach (CC=clang, CXX=clang++). $clang_dir = dirname($clang_info['clang']); - [$cc, $cxx] = $this->windowsCgoCompilers($package, $clang_info['clang']); $env = [ 'CGO_ENABLED' => '1', - 'CC' => $cc, - 'CXX' => $cxx, + 'CC' => 'clang.exe', + 'CXX' => 'clang++.exe', 'PATH' => $clang_dir . ';' . getenv('PATH'), 'CGO_CFLAGS' => clean_spaces($cgo_cflags), 'CGO_LDFLAGS' => $cgo_ldflags, @@ -430,48 +380,6 @@ public function smokeTestFrankenphpForWindows(PackageBuilder $builder): void } } - /** - * Return the [CC, CXX] cgo should use to build FrankenPHP on Windows. - * - * Go passes the MinGW-only `-mthreads` flag to the C compiler for cgo builds; - * Clang >= 20 rejects it for the MSVC target. When it does, wrap Clang with a - * small compiled shim that strips the flag before forwarding. An executable and - * not a .bat on purpose: batch files run through cmd.exe, which caps the command - * line at 8191 characters, and cgo link steps with big extension stacks (imagick) - * blow past that. A real process gets the full ~32K limit, and beyond that Go - * switches to a response file by itself. - * - * Workaround for https://github.com/golang/go/issues/80290, remove once Go - * stops passing the flag. - * - * @return array{0: string, 1: string} - */ - protected function windowsCgoCompilers(TargetPackage $package, string $clang): array - { - $probe = $package->getSourceDir() . '\mthreads-probe.c'; - file_put_contents($probe, "int main(void){return 0;}\n"); - [$ret] = cmd()->execWithResult('"' . $clang . '" -mthreads -c ' . escapeshellarg($probe) . ' -o ' . escapeshellarg($probe . '.o'), false); - FileSystem::removeFileIfExists($probe); - FileSystem::removeFileIfExists($probe . '.o'); - if ($ret === 0) { - return ['clang.exe', 'clang++.exe']; - } - - logger()->info('Clang rejects -mthreads; wrapping it to strip the flag (golang/go#80290)'); - $dir = dirname($clang); - $wrappers = []; - foreach (['cc-nothreads' => 'clang.exe', 'cxx-nothreads' => 'clang++.exe'] as $name => $compiler) { - $src = $package->getSourceDir() . "\\{$name}.c"; - $exe = $package->getSourceDir() . "\\{$name}.exe"; - file_put_contents($src, sprintf(self::MTHREADS_SHIM_C, str_replace('\\', '\\\\', "{$dir}\\{$compiler}"))); - cmd()->cd($package->getSourceDir()) - ->exec('"' . $clang . '" -O2 ' . escapeshellarg($src) . ' -o ' . escapeshellarg($exe)); - $wrappers[] = $exe; - } - - return $wrappers; - } - protected function getFrankenPHPVersion(TargetPackage $package): string { if ($version = getenv('FRANKENPHP_VERSION')) {