From 75856e361e281dc35b79aba58340c45557fcea1c Mon Sep 17 00:00:00 2001 From: Marc Date: Sat, 25 Apr 2026 21:08:08 +0700 Subject: [PATCH] Revert "fix(xlswriter): fix macOS build with modern Clang (C23)" --- src/SPC/builder/extension/xlswriter.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/SPC/builder/extension/xlswriter.php b/src/SPC/builder/extension/xlswriter.php index 8ef826d00..24d32d947 100644 --- a/src/SPC/builder/extension/xlswriter.php +++ b/src/SPC/builder/extension/xlswriter.php @@ -7,7 +7,6 @@ use SPC\builder\Extension; use SPC\store\SourcePatcher; use SPC\util\CustomExt; -use SPC\util\GlobalEnvManager; #[CustomExt('xlswriter')] class xlswriter extends Extension @@ -29,13 +28,6 @@ public function getWindowsConfigureArg(bool $shared = false): string public function patchBeforeMake(): bool { $patched = parent::patchBeforeMake(); - - // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged - if (PHP_OS_FAMILY !== 'Windows') { - GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17'); - $patched = true; - } - if (PHP_OS_FAMILY === 'Windows') { // fix windows build with openssl extension duplicate symbol bug SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir); @@ -48,10 +40,4 @@ public function patchBeforeMake(): bool } return $patched; } - - // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged - protected function getExtraEnv(): array - { - return ['CFLAGS' => '-std=gnu17']; - } }