diff options
| author | Anatol Belski <ab@php.net> | 2018-04-05 14:56:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-05 14:56:45 +0200 |
| commit | df2e4fd8fc219baae0a43e2eee4dd1ebe6b077fa (patch) | |
| tree | 22f2a45d01ce6050a602d30086e9520b3f726e75 /ext | |
| parent | 50c8d3e0e7b1bd3440513b874b04182b4702679e (diff) | |
| parent | 7768f5e2decfed03515f4bc7cdb3536a3c575a52 (diff) | |
| download | php-git-df2e4fd8fc219baae0a43e2eee4dd1ebe6b077fa.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Rename var
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/intl/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index 959ecd2b26..e8428e1cbb 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -88,7 +88,7 @@ if test "$PHP_INTL" != "no"; then breakiterator/rulebasedbreakiterator_methods.cpp \ breakiterator/codepointiterator_internal.cpp \ breakiterator/codepointiterator_methods.cpp" - PHP_INTL_CPP_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS" + PHP_INTL_CPP_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_CXXFLAGS" if test "$ext_shared" = "no"; then PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS) else |