summaryrefslogtreecommitdiff
path: root/other/Makefile.inc
diff options
context:
space:
mode:
authorJin^eLD <jin@mediatomb.cc>2014-03-23 02:01:45 +0100
committerJin^eLD <jin@mediatomb.cc>2014-03-23 02:05:57 +0100
commit70475d281dacb742e807c78a7f0fc951d85044a3 (patch)
tree6bbb2453a2b248b0644107e8b9e3f3add76e35a5 /other/Makefile.inc
parentba4681ef1eafe6de3742e037da01c1e069777470 (diff)
Fix NaCl builds for *BSD
From what I see there is a difference between *BSD and Linux when linking vs. toxcore which has been bulit vs. the NaCl library: on Linux it only links if NaCl's object files (i.e. randombytes.o) is present in the linker options, however on *BSD systems this will cause a linking error, see: https://github.com/Tox/toxic/issues/31#issuecomment-38224441 This commit makes sure that we do not add the NaCl object files to our pkg-config settings on *BSD, but do add them on Linux.
Diffstat (limited to 'other/Makefile.inc')
-rw-r--r--other/Makefile.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/other/Makefile.inc b/other/Makefile.inc
index 72a514ad..368a32f2 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -12,6 +12,7 @@ DHT_bootstrap_LDADD = $(LIBSODIUM_LDFLAGS) \
12 $(NACL_LDFLAGS) \ 12 $(NACL_LDFLAGS) \
13 libtoxcore.la \ 13 libtoxcore.la \
14 $(LIBSODIUM_LIBS) \ 14 $(LIBSODIUM_LIBS) \
15 $(NACL_OBJECTS) \
15 $(NACL_LIBS) \ 16 $(NACL_LIBS) \
16 $(WINSOCK2_LIBS) 17 $(WINSOCK2_LIBS)
17 18