diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-05-27 16:36:15 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-05-27 16:36:15 +0800 |
| commit | 90df7e75e6b1ca301d053cbe6d1dee66c586ecb8 (patch) | |
| tree | 6a67cd0bbfe9f85253c59d695c42c119f3978c7a /configure.in | |
| parent | f972e219e477fa1f4137de2de24e05c0f5c515e1 (diff) | |
| parent | f68dc94aa727085040650b4c9354672f2f62ee6a (diff) | |
| download | php-git-90df7e75e6b1ca301d053cbe6d1dee66c586ecb8.tar.gz | |
Merge branch 'master' into merge-fastcgi
Conflicts:
sapi/fpm/fpm/fpm_main.c
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index f24f8eaeda..b70f024252 100644 --- a/configure.in +++ b/configure.in @@ -1436,10 +1436,10 @@ CC=$old_CC PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS -CFLAGS_CLEAN=$CFLAGS +CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" -CXXFLAGS="$CXXFLAGS $standard_libtool_flag" +CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then pharcmd=pharcmd |