Merge branch '81133'

* 81133: Set BUILD_CC for phpize
php · Jun 13, 2021 · edc0d76 · edc0d76
2 parents 9245423 + c292265
commit edc0d76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0alpha2
 
+- Opcache:
+  . Fixed bug #81133 (building opcache with phpize fails). (krakjoe)
+
 - PDO OCI:
   . Fixed bug #77120 (Support 'success with info' at connection).
     (Sergei Morozov)

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
@@ -170,6 +170,14 @@ CXXFLAGS_CLEAN='$(CXXFLAGS)'
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
 
+if test "$cross_compiling" = yes ; then
+  AC_MSG_CHECKING(for native build C compiler)
+  AC_CHECK_PROGS(BUILD_CC, [gcc clang c99 c89 cc cl],none)
+  AC_MSG_RESULT($BUILD_CC)
+else
+  BUILD_CC=$CC
+fi
+
 PHP_SUBST(PHP_MODULES)
 PHP_SUBST(PHP_ZEND_EX)
 
@@ -202,6 +210,7 @@ PHP_SUBST(SHARED_LIBTOOL)
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(SHELL)
 PHP_SUBST(INSTALL_HEADERS)
+PHP_SUBST(BUILD_CC)
 
 PHP_GEN_BUILD_DIRS
 PHP_GEN_GLOBAL_MAKEFILE