diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 52a323c581488..83317c154e549 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -170,7 +170,7 @@ jobs: - name: ./configure uses: ./.github/actions/configure-macos with: - configurationParameters: --enable-debug --disable-zts + configurationParameters: --enable-debug --enable-zts - name: make run: |- export PATH="$(brew --prefix)/opt/bison/bin:$PATH" diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 4bab4f21bc532..708a821819606 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -42,6 +42,10 @@ if test "$PHP_OPCACHE" != "no"; then PHP_OPCACHE_JIT=no ;; esac + if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then + AC_MSG_WARN([JIT not supported on Apple Silicon with ZTS]) + PHP_OPCACHE_JIT=no + fi fi if test "$PHP_OPCACHE_JIT" = "yes" ; then