From a5deb387594faaedca74421e605c0b4a87843487 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Wed, 21 Aug 2013 12:33:54 +0200
Subject: [PATCH] Various OSX fixes.
---
lib/c/Makefile | 3 ++-
lib/c/labcomm_compat_osx.h | 2 +-
lib/c/liblabcomm.so | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
mode change 100755 => 120000 lib/c/liblabcomm.so
diff --git a/lib/c/Makefile b/lib/c/Makefile
index f0cd5a8..7ada2b7 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -8,9 +8,10 @@ ifeq ($(UNAME_S),Linux)
MAKESHARED=gcc -o $1 -shared -Wl,-soname,$2 $3 -lc -lrt
else ifeq ($(UNAME_S),Darwin)
CC=clang
- CFLAGS=-g -Wall -Werror -O3 -I. -Itest
+ CFLAGS=-g -Wall -Werror -O3 -I. -Itest \
-DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
-Wno-tautological-compare -Wno-unused-function
+ LDFLAGS=-L.
LDLIBS=-llabcomm
MAKESHARED=clang -o $1 -shared -Wl,-install_name,$2 $3 -lc
else
diff --git a/lib/c/labcomm_compat_osx.h b/lib/c/labcomm_compat_osx.h
index da41c50..1219f3f 100644
--- a/lib/c/labcomm_compat_osx.h
+++ b/lib/c/labcomm_compat_osx.h
@@ -13,7 +13,7 @@
#include <mach/mach.h>
#define CLOCK_REALTIME 0
-static void clock_gettime(int garbage, struct timespec *ts)
+static inline void clock_gettime(int garbage, struct timespec *ts)
{
(void) garbage;
clock_serv_t cclock;
diff --git a/lib/c/liblabcomm.so b/lib/c/liblabcomm.so
deleted file mode 100755
index 7124257..0000000
--- a/lib/c/liblabcomm.so
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(liblabcomm.so.1)
diff --git a/lib/c/liblabcomm.so b/lib/c/liblabcomm.so
new file mode 120000
index 0000000..8b0c62d
--- /dev/null
+++ b/lib/c/liblabcomm.so
@@ -0,0 +1 @@
+liblabcomm.so.1
\ No newline at end of file
--
GitLab