aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-06-30 19:42:28 -0400
committerRob Austein <sra@hactrn.net>2016-06-30 19:42:28 -0400
commit0f9af660f4aa89bcf94c1afe0302de6c7b3fa9b6 (patch)
treeb435ccf665de7a5151ec2b8aee8007dc16524b36
parent5b29ea6472dd5ac71771ce9dc61c1193f81267a5 (diff)
libhal's RPC MUX daemon doesn't work with Apple's lame sockets implementation.
Apple, for reasons unknown, chose not to implement SOCK_SEQPACKET. This works on Linux and *BSD, and libhal's MUX daemon uses it to avoid having to add its own framing protocol on top of SOCK_STREAM. So, at least for now, Mac OS X will not support the multiplex daemon, only direct connection to the HSM by a single client.
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 85a7552..477653e 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,11 @@ LIBS := ${LIBHAL_BLD}/libhal.a ${LIBTFM_BLD}/libtfm.a
ifeq "${UNAME}" "Darwin"
SONAME := libpkcs11.dylib
SOFLAGS := -dynamiclib
+ LIBHAL_TARGET := serial
else
SONAME := libpkcs11.so
SOFLAGS := -Wl,-Bsymbolic-functions -Wl,-Bsymbolic -Wl,-z,noexecstack -Wl,-soname,${SONAME}.0
+ LIBHAL_TARGET := daemon
endif
ifeq "${ENABLE_FOOTNOTE_WARNINGS}" "no"
@@ -132,7 +134,7 @@ ${LIBTFM_BLD}/libtfm.a: .FORCE
${MAKE} -C libtfm
${LIBHAL_BLD}/libhal.a: .FORCE ${LIBTFM_BLD}/libtfm.a
- ${MAKE} -C libhal daemon
+ ${MAKE} -C libhal ${LIBHAL_TARGET}
${SQLITE3_BLD}/libsqlite3.a: .FORCE
${MAKE} -C sqlite3