pyrox.dev
1diff --git a/bindings/c/local.mk b/bindings/c/local.mk
2index c861a29c..ff886e93 100644
3--- a/bindings/c/local.mk
4+++ b/bindings/c/local.mk
5@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
6 CLEAN_TARGETS += fdb_c_tests_clean
7
8 ifeq ($(PLATFORM),linux)
9- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
10- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
11+ fdb_c_LIBS += lib/libstdc++.a
12+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
13 fdb_c_tests_LIBS += -lpthread
14 endif
15
16diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
17index 2ef4fcb7..6e59625c 100644
18--- a/bindings/flow/tester/local.mk
19+++ b/bindings/flow/tester/local.mk
20@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
21 @rm -rf bindings/flow/bin
22
23 ifeq ($(PLATFORM),linux)
24- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
25- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
26+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
27 else ifeq ($(PLATFORM),osx)
28 fdb_flow_tester_LDFLAGS += -lc++
29 endif
30diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
31index ca5dbab6..012f0130 100644
32--- a/fdbbackup/local.mk
33+++ b/fdbbackup/local.mk
34@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
35 fdbbackup_STATIC_LIBS := $(TLS_LIBS)
36
37 ifeq ($(PLATFORM),linux)
38- fdbbackup_LIBS += -ldl -lpthread -lrt
39- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
40+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
41
42 # GPerfTools profiler (uncomment to use)
43 # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
44diff --git a/fdbcli/local.mk b/fdbcli/local.mk
45index fd738876..3af026b9 100644
46--- a/fdbcli/local.mk
47+++ b/fdbcli/local.mk
48@@ -22,14 +22,13 @@
49
50 fdbcli_CFLAGS := $(fdbclient_CFLAGS)
51 fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
52-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
53+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
54 fdbcli_STATIC_LIBS := $(TLS_LIBS)
55
56 fdbcli_GENERATED_SOURCES += versions.h
57
58 ifeq ($(PLATFORM),linux)
59- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
60- fdbcli_LIBS += -lpthread -lrt
61+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
62 else ifeq ($(PLATFORM),osx)
63 fdbcli_LDFLAGS += -lc++
64 endif
65diff --git a/fdbserver/local.mk b/fdbserver/local.mk
66index 690916d0..475abbaf 100644
67--- a/fdbserver/local.mk
68+++ b/fdbserver/local.mk
69@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
70 fdbserver_STATIC_LIBS := $(TLS_LIBS)
71
72 ifeq ($(PLATFORM),linux)
73- fdbserver_LIBS += -ldl -lpthread -lrt
74- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
75+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
76
77 # GPerfTools profiler (uncomment to use)
78 # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1