Merge pull request #36 from baldwinmatt/master

Link binaries against -lrt

Author: colmmacc

bin/Makefile

@@ -16,7 +16,13 @@
 all: s2nc s2nd
 include ../s2n.mk
 
-LDFLAGS += -L../lib/ -ls2n -lcrypto 
+ifeq ($(shell uname),Darwin)
+    LIBS = -lcrypto
+else
+    LIBS = -lcrypto -lrt
+endif
+
+LDFLAGS += -L../lib/ -ls2n ${LIBS}
 CRUFT += s2nc s2nd
 
 s2nc: s2nc.c echo.c

tests/unit/Makefile

@@ -22,10 +22,16 @@ include ../../s2n.mk
 
 CRUFT += $(wildcard *_test)
 
+ifeq ($(shell uname),Darwin)
+    LIBS = -lcrypto -lpthread -lm
+else
+    LIBS = -lcrypto -lpthread -lm -lrt
+endif
+
 # Suppress the unreachable code warning, because tests involve what should be
 # unreachable code
 CFLAGS += -Wno-unreachable-code -I../../ -I../../api/
-LDFLAGS += -L../../lib/ -L../testlib/ -ltests2n -ls2n -lcrypto -lpthread -lm
+LDFLAGS += -L../../lib/ -L../testlib/ -ltests2n -ls2n ${LIBS}
 
 run_tests: build_tests
 	(for test in *_test ; do DYLD_LIBRARY_PATH="../../lib/:../testlib/:$$DYLD_LIBRARY_PATH" LD_LIBRARY_PATH="../../lib/:../testlib/:$$LD_LIBRARY_PATH" ./$$test || exit 1 ; done )