diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-06-20 10:41:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-06-20 10:41:59 -0700 |
| commit | 011be49dda5c36d6a04af83165c872196342ebaa (patch) | |
| tree | 27a6aae4e8476483949421982f25122817cd4cfd | |
| parent | 44f4d2be0174904061fffe4760987016bcbfdfc2 (diff) | |
| parent | bcf2e10ae75a02d35971d446f430eafd41e48db5 (diff) | |
| download | php-git-011be49dda5c36d6a04af83165c872196342ebaa.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "ICU 59+ requires C++11 and errors out without the option"
| -rw-r--r-- | ext/intl/config.m4 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index e8fad2e432..52408f8e91 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -18,9 +18,6 @@ if test "$PHP_INTL" != "no"; then else icu_spoof_src="" fi - if test "$icu_version" -ge "59000"; then - ICU_CXXFLAGS="$ICU_CXXFLAGS -std=c++11 -stdlib=libc++" - fi PHP_NEW_EXTENSION(intl, php_intl.c \ intl_error.c \ intl_convert.c \ |