summaryrefslogtreecommitdiff
path: root/testing/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 /testing/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 'testing/Makefile.inc')
-rw-r--r--testing/Makefile.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index 31c84678..812a5be1 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -36,6 +36,7 @@ DHT_test_LDADD = $(LIBSODIUM_LDFLAGS) \
36 $(NACL_LDFLAGS) \ 36 $(NACL_LDFLAGS) \
37 libtoxcore.la \ 37 libtoxcore.la \
38 $(LIBSODIUM_LIBS) \ 38 $(LIBSODIUM_LIBS) \
39 $(NACL_OBJECTS) \
39 $(NACL_LIBS) \ 40 $(NACL_LIBS) \
40 $(WINSOCK2_LIBS) 41 $(WINSOCK2_LIBS)
41 42
@@ -52,6 +53,7 @@ Lossless_UDP_testclient_LDADD = \
52 $(NACL_LDFLAGS) \ 53 $(NACL_LDFLAGS) \
53 libtoxcore.la \ 54 libtoxcore.la \
54 $(LIBSODIUM_LIBS) \ 55 $(LIBSODIUM_LIBS) \
56 $(NACL_OBJECTS) \
55 $(NACL_LIBS) \ 57 $(NACL_LIBS) \
56 $(WINSOCK2_LIBS) 58 $(WINSOCK2_LIBS)
57 59
@@ -68,6 +70,7 @@ Lossless_UDP_testserver_LDADD = \
68 $(NACL_LDFLAGS) \ 70 $(NACL_LDFLAGS) \
69 libtoxcore.la \ 71 libtoxcore.la \
70 $(LIBSODIUM_LIBS) \ 72 $(LIBSODIUM_LIBS) \
73 $(NACL_OBJECTS) \
71 $(NACL_LIBS) \ 74 $(NACL_LIBS) \
72 $(WINSOCK2_LIBS) 75 $(WINSOCK2_LIBS)
73 76
@@ -82,6 +85,7 @@ Messenger_test_LDADD = $(LIBSODIUM_LDFLAGS) \
82 $(NACL_LDFLAGS) \ 85 $(NACL_LDFLAGS) \
83 libtoxcore.la \ 86 libtoxcore.la \
84 $(LIBSODIUM_LIBS) \ 87 $(LIBSODIUM_LIBS) \
88 $(NACL_OBJECTS) \
85 $(NACL_LIBS) \ 89 $(NACL_LIBS) \
86 $(WINSOCK2_LIBS) 90 $(WINSOCK2_LIBS)
87 91
@@ -98,6 +102,7 @@ crypto_speed_test_LDADD = \
98 $(NACL_LDFLAGS) \ 102 $(NACL_LDFLAGS) \
99 libtoxcore.la \ 103 libtoxcore.la \
100 $(LIBSODIUM_LIBS) \ 104 $(LIBSODIUM_LIBS) \
105 $(NACL_OBJECTS) \
101 $(NACL_LIBS) \ 106 $(NACL_LIBS) \
102 $(WINSOCK2_LIBS) 107 $(WINSOCK2_LIBS)
103 108
@@ -114,6 +119,7 @@ tox_sync_LDADD = $(LIBSODIUM_LDFLAGS) \
114 $(NACL_LDFLAGS) \ 119 $(NACL_LDFLAGS) \
115 libtoxcore.la \ 120 libtoxcore.la \
116 $(LIBSODIUM_LIBS) \ 121 $(LIBSODIUM_LIBS) \
122 $(NACL_OBJECTS) \
117 $(NACL_LIBS) \ 123 $(NACL_LIBS) \
118 $(WINSOCK2_LIBS) 124 $(WINSOCK2_LIBS)
119endif 125endif