From 711fa6635f0160387ef03f9b0b3db268ce83518f Mon Sep 17 00:00:00 2001 From: Dengke Tang <815825145@qq.com> Date: Tue, 28 Jan 2025 15:22:11 -0800 Subject: [PATCH] Fix segfaults -- CRC64NVME on machines with disabled AVX and uri parsing corner case (#119) --- Makefile.frag | 6 +++--- crt/aws-crt-ffi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.frag b/Makefile.frag index a3c93c8..2f726b8 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,7 +1,7 @@ INT_DIR=$(builddir)/build/install CMAKE_BUILD_DIR=$(builddir)/cmake_build -GENERATE_STUBS=$(shell expr `$(PHP_EXECUTABLE) --version | head -1 | cut -f 2 -d' '` \>= 7.1) +GENERATE_STUBS=$(shell expr `php --version | head -1 | cut -f 2 -d' '` \>= 7.1) CMAKE = cmake3 ifeq (, $(shell which cmake3)) @@ -63,13 +63,13 @@ $(builddir)/ext/awscrt.c: $(CMAKE_BUILD_DIR)/aws-crt-ffi-static/libaws-crt-ffi.a $(srcdir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php ifeq ($(GENERATE_STUBS),1) # generate awscrt_arginfo.h - $(PHP_EXECUTABLE) $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php + php $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php endif # transform/install api.h from FFI lib $(srcdir)/ext/api.h: $(srcdir)/crt/aws-crt-ffi/src/api.h # generate api.h - $(PHP_EXECUTABLE) $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h + php $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h # install api.h to ext/ as well $(builddir)/ext/api.h : $(srcdir)/ext/api.h diff --git a/crt/aws-crt-ffi b/crt/aws-crt-ffi index dbfc87f..b350694 160000 --- a/crt/aws-crt-ffi +++ b/crt/aws-crt-ffi @@ -1 +1 @@ -Subproject commit dbfc87f28daa7a01c43f2f775e10605569f6eeff +Subproject commit b35069433a03054be7ba9436e1c18f30358cdb75