diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php
index 3f07d26b..8ca0bb39 100644
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -140,10 +140,10 @@ class LinuxBuilder extends UnixBuilderBase
         $envs_build_php = SystemUtil::makeEnvVarString([
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
             'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
-            // -std=c++17 will be able to be removed when https://github.com/php/php-src/pull/14002 will be released
-            'CXXFLAGS' => '-std=c++17 ' . getenv('SPC_CMD_VAR_PHP_CONFIGURE_CXXFLAGS'),
             'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
             'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'),
+            // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
+            'CXX' => 'g++ -std=c++17',
         ]);
 
         // upx pack and strip for micro
diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php
index b9e6a19e..0b11830e 100644
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -116,7 +116,7 @@ class MacOSBuilder extends UnixBuilderBase
         // add macOS frameworks
         $extra_libs .= (empty($extra_libs) ? '' : ' ') . $this->getFrameworks(true);
         // add libc++, some extensions or libraries need it (C++ cannot be linked statically)
-        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lc++' : '');
+        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lc++ ' : '');
         // bloat means force-load all static libraries, even if they are not used
         if (!$this->getOption('bloat', false)) {
             $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles());
@@ -146,9 +146,9 @@ class MacOSBuilder extends UnixBuilderBase
         $envs_build_php = SystemUtil::makeEnvVarString([
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
             'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
-            // -std=c++17 will be able to be removed when https://github.com/php/php-src/pull/14002 will be released
-            'CXXFLAGS' => '-std=c++17 ' . getenv('SPC_CMD_VAR_PHP_CONFIGURE_CXXFLAGS'),
             'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
+            // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
+            'CXX' => 'g++ -std=c++17',
         ]);
 
         if ($this->getLib('postgresql')) {
diff --git a/src/SPC/builder/macos/library/icu.php b/src/SPC/builder/macos/library/icu.php
index 47665467..14a0ae94 100644
--- a/src/SPC/builder/macos/library/icu.php
+++ b/src/SPC/builder/macos/library/icu.php
@@ -11,10 +11,8 @@ class icu extends MacOSLibraryBase
     protected function build(): void
     {
         $root = BUILD_ROOT_PATH;
-
-        $cxxflags = 'CXXFLAGS="-std=c++17"';
         shell()->cd($this->source_dir . '/source')
-            ->exec("{$cxxflags} ./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
+            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');