From 28534400728f75428a72cfb4e23ea2382b018b89 Mon Sep 17 00:00:00 2001 From: Alex Samorukov Date: Fri, 8 Jan 2021 19:09:09 +0100 Subject: [PATCH 1/3] Remove builddir prefix for the jit/zend_jit.lo --- ext/opcache/jit/Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag index d4f97de76df4f..6b89b26d74fb1 100644 --- a/ext/opcache/jit/Makefile.frag +++ b/ext/opcache/jit/Makefile.frag @@ -5,7 +5,7 @@ $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc -$(builddir)/jit/zend_jit.lo: \ +jit/zend_jit.lo: \ $(builddir)/jit/zend_jit_x86.c \ $(srcdir)/jit/zend_jit_helpers.c \ $(srcdir)/jit/zend_jit_disasm_x86.c \ From e4be30217660477ca986db828f6f31db442e7fe5 Mon Sep 17 00:00:00 2001 From: Alex Samorukov Date: Sat, 9 Jan 2021 01:26:11 +0100 Subject: [PATCH 2/3] Add non-prefixed target to fix local extension build --- ext/opcache/jit/Makefile.frag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag index 6b89b26d74fb1..60feb240b6eca 100644 --- a/ext/opcache/jit/Makefile.frag +++ b/ext/opcache/jit/Makefile.frag @@ -5,7 +5,7 @@ $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc -jit/zend_jit.lo: \ +$(builddir)jit/zend_jit.lo: \ $(builddir)/jit/zend_jit_x86.c \ $(srcdir)/jit/zend_jit_helpers.c \ $(srcdir)/jit/zend_jit_disasm_x86.c \ @@ -16,3 +16,4 @@ jit/zend_jit.lo: \ $(srcdir)/jit/zend_jit_trace.c \ $(srcdir)/jit/zend_elf.c +jit/zend_jit.lo: $(builddir)/jit/zend_jit.lo From a68eda5058d031dc575c33f0034ec225d3692d2c Mon Sep 17 00:00:00 2001 From: Alex Samorukov Date: Sat, 9 Jan 2021 01:26:33 +0100 Subject: [PATCH 3/3] Fix path --- ext/opcache/jit/Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag index 60feb240b6eca..c69d86c815857 100644 --- a/ext/opcache/jit/Makefile.frag +++ b/ext/opcache/jit/Makefile.frag @@ -5,7 +5,7 @@ $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc -$(builddir)jit/zend_jit.lo: \ +$(builddir)/jit/zend_jit.lo: \ $(builddir)/jit/zend_jit_x86.c \ $(srcdir)/jit/zend_jit_helpers.c \ $(srcdir)/jit/zend_jit_disasm_x86.c \