diff --git a/src/SPC/builder/extension/intl.php b/src/SPC/builder/extension/intl.php
new file mode 100644
index 00000000..8130b5d3
--- /dev/null
+++ b/src/SPC/builder/extension/intl.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('intl')]
+class intl extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
+        // Also need to use clang++ -std=c++17 to force override the default C++ standard
+        if (is_string($env = getenv('CXX')) && !str_contains($env, 'std=c++17')) {
+            f_putenv('CXX=' . $env . ' -std=c++17');
+        } else {
+            f_putenv('CXX=clang++ -std=c++17');
+        }
+        return true;
+    }
+}
diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php
index 12393627..2f509f1e 100644
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -168,9 +168,6 @@ class LinuxBuilder extends UnixBuilderBase
             );
         }
 
-        // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
-        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
-
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
                 getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php
index 6c601816..522c12d3 100644
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -173,9 +173,6 @@ class MacOSBuilder extends UnixBuilderBase
         $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
 
-        // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
-        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
-
         $this->cleanMake();
 
         if ($enableCli) {