Merge branch 'PHP-5.6'

* PHP-5.6:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
This commit is contained in:
Anatol Belski 2014-07-10 19:37:36 +02:00
commit e00a4b92a3

View File

@ -1024,6 +1024,11 @@ function is_pgo_desired(mod)
{
var varname = "PHP_" + mod.toUpperCase() + "_PGO";
/* XXX enable PGO in phpize mode */
if (MODE_PHPIZE) {
return false;
}
/* don't disable if there's no mention of the varname */
if (eval("typeof " + varname + " == 'undefined'")) {
return true;