Skip to content

Commit 5d9e4e2

Browse files
authored
Revert "fix(xlswriter): fix macOS build with modern Clang (C23)" (#1122)
2 parents eb97711 + 75856e3 commit 5d9e4e2

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

src/SPC/builder/extension/xlswriter.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use SPC\builder\Extension;
88
use SPC\store\SourcePatcher;
99
use SPC\util\CustomExt;
10-
use SPC\util\GlobalEnvManager;
1110

1211
#[CustomExt('xlswriter')]
1312
class xlswriter extends Extension
@@ -29,13 +28,6 @@ public function getWindowsConfigureArg(bool $shared = false): string
2928
public function patchBeforeMake(): bool
3029
{
3130
$patched = parent::patchBeforeMake();
32-
33-
// Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
34-
if (PHP_OS_FAMILY !== 'Windows') {
35-
GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
36-
$patched = true;
37-
}
38-
3931
if (PHP_OS_FAMILY === 'Windows') {
4032
// fix windows build with openssl extension duplicate symbol bug
4133
SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
@@ -48,10 +40,4 @@ public function patchBeforeMake(): bool
4840
}
4941
return $patched;
5042
}
51-
52-
// Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
53-
protected function getExtraEnv(): array
54-
{
55-
return ['CFLAGS' => '-std=gnu17'];
56-
}
5743
}

0 commit comments

Comments
 (0)