Skip to content

Commit f9b2e0a

Browse files
committed
fix build warnings for Haiku.
especially linker warning about php binary having an executable stack.
1 parent d6d0a2a commit f9b2e0a

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

configure.ac

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,14 @@ case $host_alias in
234234
;;
235235
esac
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+
237245
dnl Detect musl libc
238246
AC_MSG_CHECKING([whether we are using musl libc])
239247
if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1

ext/sockets/sockets.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff 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

115117
static PHP_GINIT_FUNCTION(sockets);

0 commit comments

Comments
 (0)