Skip to content

Commit ca47fb8

Browse files
committed
Fixed build with -disable-opcache-jit
1 parent 3be3100 commit ca47fb8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/opcache/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ if test "$PHP_OPCACHE" != "no"; then
9696

9797
JIT_CFLAGS=
9898

99-
elif test "$PHP_OPCACHE_JIT_IR" = "yes"; then
99+
elif test "$PHP_OPCACHE_JIT" = "yes" -a "$PHP_OPCACHE_JIT_IR" = "yes"; then
100100
AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT])
101101
AC_DEFINE(ZEND_JIT_IR, 1, [Use JIT IR framework])
102102
ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_vm_helpers.c jit/ir/ir.c jit/ir/ir_strtab.c \

ext/opcache/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if (PHP_OPCACHE != "no") {
3939
} else {
4040
WARNING("JIT not enabled, headers not found");
4141
}
42-
} else if (PHP_OPCACHE_JIT_IR == "yes") {
42+
} else if (PHP_OPCACHE_JIT == "yes" && PHP_OPCACHE_JIT_IR == "yes") {
4343
if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
4444
var dasm_flags = (X64 ? "-D X64=1" : "") + (X64 ? " -D X64WIN=1" : "") + " -D WIN=1";
4545
var ir_target = (X64 ? "IR_TARGET_X64" : "IR_TARGET_X86");

0 commit comments

Comments
 (0)