File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed
Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -234,6 +234,14 @@ case $host_alias in
234234 ;;
235235esac
236236
237+ dnl to disable executable stack on haiku due
238+ dnl to missing elf .note.GNU-stack part
239+ case $host_alias in
240+ *haiku*)
241+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
242+ ;;
243+ esac
244+
237245dnl Detect musl libc
238246AC_MSG_CHECKING ( [ whether we are using musl libc] )
239247if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
Original file line number Diff line number Diff line change @@ -109,7 +109,9 @@ ZEND_DECLARE_MODULE_GLOBALS(sockets)
109109 } \
110110 } while (0)
111111#else
112- #define PHP_ETH_PROTO_CHECK (protocol , family ) (0)
112+ #define PHP_ETH_PROTO_CHECK (protocol , family ) \
113+ (void)protocol; \
114+ (void)family
113115#endif
114116
115117static PHP_GINIT_FUNCTION (sockets );
You can’t perform that action at this time.
0 commit comments