pyrox.dev
1diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
2index 5e6b9cfb..73f4e5f3 100644
3--- a/FDBLibTLS/local.mk
4+++ b/FDBLibTLS/local.mk
5@@ -1,6 +1,5 @@
6 FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc
7-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
8-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
9+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
10 FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
11
12 # The plugin isn't a typical library, so it feels more sensible to have a copy
13diff --git a/bindings/c/local.mk b/bindings/c/local.mk
14index 44f0c31b..7aea5a4f 100644
15--- a/bindings/c/local.mk
16+++ b/bindings/c/local.mk
17@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
18 CLEAN_TARGETS += fdb_c_tests_clean
19
20 ifeq ($(PLATFORM),linux)
21- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
22- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
23+ fdb_c_LIBS += lib/libstdc++.a
24+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
25 fdb_c_tests_LIBS += -lpthread
26 endif
27
28diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
29index 2ef4fcb7..6e59625c 100644
30--- a/bindings/flow/tester/local.mk
31+++ b/bindings/flow/tester/local.mk
32@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
33 @rm -rf bindings/flow/bin
34
35 ifeq ($(PLATFORM),linux)
36- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
37- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
38+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
39 else ifeq ($(PLATFORM),osx)
40 fdb_flow_tester_LDFLAGS += -lc++
41 endif
42diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
43index 033fe7d4..865fc923 100644
44--- a/fdbbackup/local.mk
45+++ b/fdbbackup/local.mk
46@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
47 fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
48
49 ifeq ($(PLATFORM),linux)
50- fdbbackup_LIBS += -ldl -lpthread -lrt
51- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
52+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
53
54 # GPerfTools profiler (uncomment to use)
55 # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
56diff --git a/fdbcli/local.mk b/fdbcli/local.mk
57index 81a4a42e..892c079c 100644
58--- a/fdbcli/local.mk
59+++ b/fdbcli/local.mk
60@@ -22,14 +22,13 @@
61
62 fdbcli_CFLAGS := $(fdbclient_CFLAGS)
63 fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
64-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
65+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
66 fdbcli_STATIC_LIBS :=
67
68 fdbcli_GENERATED_SOURCES += versions.h
69
70 ifeq ($(PLATFORM),linux)
71- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
72- fdbcli_LIBS += -lpthread -lrt
73+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
74 else ifeq ($(PLATFORM),osx)
75 fdbcli_LDFLAGS += -lc++
76 endif
77diff --git a/fdbserver/local.mk b/fdbserver/local.mk
78index 78cad1bf..36f2c0f7 100644
79--- a/fdbserver/local.mk
80+++ b/fdbserver/local.mk
81@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
82 fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
83
84 ifeq ($(PLATFORM),linux)
85- fdbserver_LIBS += -ldl -lpthread -lrt
86- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
87+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
88
89 # GPerfTools profiler (uncomment to use)
90 # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1