Skip to content

Commit 408272b

Browse files
dktappsnikic
authored andcommitted
Remove generated zend_jit_x86.c on make clean
Not removing this causes build failure when reconfiguring and rebuilding after a `make clean`, e.g. enabling/disabling ZTS. This makes https://bugs.php.net/bug.php?id=80561 more bearable. Ideally it would be rebuilt automatically on configuration change if necessary, but I have no idea how to implement this. Closes phpGH-6702.
1 parent fad87a2 commit 408272b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build/Makefile.global

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ clean:
116116
find . -name \*.so | xargs rm -f
117117
find . -name .libs -a -type d|xargs rm -rf
118118
rm -f libphp.la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
119+
rm -f ext/opcache/jit/zend_jit_x86.c
119120

120121
distclean: clean
121122
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
@@ -124,7 +125,6 @@ distclean: clean
124125
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
125126
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
126127
rm -f ext/phar/phar.phar ext/phar/phar.php
127-
rm -f ext/opcache/jit/zend_jit_x86.c
128128
if test "$(srcdir)" != "$(builddir)"; then \
129129
rm -f ext/phar/phar/phar.inc; \
130130
fi

0 commit comments

Comments
 (0)