fix: use C++ 17 compiler for ICU

This commit is contained in:
Kévin Dunglas
2024-04-19 10:02:16 +02:00
parent 21dbb8af46
commit 354e2d0664
2 changed files with 4 additions and 2 deletions

View File

@@ -11,7 +11,7 @@ class icu extends LinuxLibraryBase
protected function build(): void protected function build(): void
{ {
$cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"'; $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"'; $ldflags = 'LDFLAGS="-static"';
shell()->cd($this->source_dir . '/source') shell()->cd($this->source_dir . '/source')
->exec( ->exec(

View File

@@ -11,8 +11,10 @@ class icu extends MacOSLibraryBase
protected function build(): void protected function build(): void
{ {
$root = BUILD_ROOT_PATH; $root = BUILD_ROOT_PATH;
$cxxflags = 'CXXFLAGS="-std=c++17"';
shell()->cd($this->source_dir . '/source') 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 clean')
->exec("make -j{$this->builder->concurrency}") ->exec("make -j{$this->builder->concurrency}")
->exec('make install'); ->exec('make install');