Skip to content
Snippets Groups Projects
Commit de9a1079 authored by Stanley Cheung's avatar Stanley Cheung Committed by GitHub
Browse files

Merge pull request #11194 from stanley-cheung/php-fix-ext-cc-compile-error

PHP: fix pecl extension after cc files are added
parents eb9b82b7 94d75888
No related branches found
No related tags found
No related merge requests found
...@@ -13,9 +13,11 @@ if test "$PHP_GRPC" != "no"; then ...@@ -13,9 +13,11 @@ if test "$PHP_GRPC" != "no"; then
LIBS="-lpthread $LIBS" LIBS="-lpthread $LIBS"
CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11"
CXXFLAGS="-std=c++11"
GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD" GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
PHP_REQUIRE_CXX()
PHP_ADD_LIBRARY(pthread) PHP_ADD_LIBRARY(pthread)
PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD) PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD)
PHP_ADD_LIBRARY(dl) PHP_ADD_LIBRARY(dl)
...@@ -688,9 +690,8 @@ if test "$PHP_GRPC" != "no"; then ...@@ -688,9 +690,8 @@ if test "$PHP_GRPC" != "no"; then
third_party/cares/cares/inet_net_pton.c \ third_party/cares/cares/inet_net_pton.c \
third_party/cares/cares/inet_ntop.c \ third_party/cares/cares/inet_ntop.c \
third_party/cares/cares/windows_port.c \ third_party/cares/cares/windows_port.c \
, $ext_shared, , -Wall -Werror \ , $ext_shared, , -fvisibility=hidden \
-Wno-parentheses-equality -Wno-unused-value -std=c11 \ -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
-fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
-D_HAS_EXCEPTIONS=0 -DNOMINMAX) -D_HAS_EXCEPTIONS=0 -DNOMINMAX)
PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc) PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
......
...@@ -15,9 +15,11 @@ ...@@ -15,9 +15,11 @@
LIBS="-lpthread $LIBS" LIBS="-lpthread $LIBS"
CFLAGS="-Wall -Werror -Wno-parentheses-equality -Wno-unused-value -std=c11"
CXXFLAGS="-std=c++11"
GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD" GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
PHP_REQUIRE_CXX()
PHP_ADD_LIBRARY(pthread) PHP_ADD_LIBRARY(pthread)
PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD) PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD)
PHP_ADD_LIBRARY(dl) PHP_ADD_LIBRARY(dl)
...@@ -43,9 +45,8 @@ ...@@ -43,9 +45,8 @@
% endfor % endfor
% endif % endif
% endfor % endfor
, $ext_shared, , -Wall -Werror ${"\\"} , $ext_shared, , -fvisibility=hidden ${"\\"}
-Wno-parentheses-equality -Wno-unused-value -std=c11 ${"\\"} -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN ${"\\"}
-fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN ${"\\"}
-D_HAS_EXCEPTIONS=0 -DNOMINMAX) -D_HAS_EXCEPTIONS=0 -DNOMINMAX)
PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc) PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment