From 354e2d06644b4ef90d459089cd7ceead90ba1f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 19 Apr 2024 10:02:16 +0200 Subject: [PATCH] fix: use C++ 17 compiler for ICU --- src/SPC/builder/linux/library/icu.php | 2 +- src/SPC/builder/macos/library/icu.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SPC/builder/linux/library/icu.php b/src/SPC/builder/linux/library/icu.php index c2d579f5..dc0939da 100644 --- a/src/SPC/builder/linux/library/icu.php +++ b/src/SPC/builder/linux/library/icu.php @@ -11,7 +11,7 @@ class icu extends LinuxLibraryBase protected function build(): void { $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"'; - $cxxflags = 'CXXFLAGS="-std=c++11"'; + $cxxflags = 'CXXFLAGS="-std=c++17"'; $ldflags = 'LDFLAGS="-static"'; shell()->cd($this->source_dir . '/source') ->exec( diff --git a/src/SPC/builder/macos/library/icu.php b/src/SPC/builder/macos/library/icu.php index 14a0ae94..47665467 100644 --- a/src/SPC/builder/macos/library/icu.php +++ b/src/SPC/builder/macos/library/icu.php @@ -11,8 +11,10 @@ class icu extends MacOSLibraryBase protected function build(): void { $root = BUILD_ROOT_PATH; + + $cxxflags = 'CXXFLAGS="-std=c++17"'; shell()->cd($this->source_dir . '/source') - ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}") + ->exec("{$cxxflags} ./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}") ->exec('make clean') ->exec("make -j{$this->builder->concurrency}") ->exec('make install');