Skip to content

Commit 58a86fa

Browse files
committed
[build] OpenSSL linking reorder (#2156)
Signed-off-by: r4sas <[email protected]>
1 parent 8a7c404 commit 58a86fa

5 files changed

+6
-6
lines changed

Makefile.bsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misl
33
DEFINES = -D_GLIBCXX_USE_NANOSLEEP=1
44
INCFLAGS = -I/usr/include/ -I/usr/local/include/
55
LDFLAGS = ${LD_DEBUG} -Wl,-rpath,/usr/local/lib -L/usr/local/lib
6-
LDLIBS = -lcrypto -lssl -lz -lpthread -lboost_system -lboost_program_options
6+
LDLIBS = -lssl -lcrypto -lz -lpthread -lboost_system -lboost_program_options
77

88
## NOTE: NEEDED_CXXFLAGS is here so that custom CXXFLAGS can be specified at build time
99
## **without** overwriting the CXXFLAGS which we need in order to build.

Makefile.haiku

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CXX = g++
22
CXXFLAGS := -Wall -std=c++17
33
INCFLAGS = -I/system/develop/headers
44
DEFINES = -D_DEFAULT_SOURCE -D_GNU_SOURCE
5-
LDLIBS = -lbe -lbsd -lnetwork -lz -lcrypto -lssl -lboost_system -lboost_program_options -lpthread
5+
LDLIBS = -lbe -lbsd -lnetwork -lz -lssl -lcrypto -lboost_system -lboost_program_options -lpthread
66

77
ifeq ($(USE_UPNP),yes)
88
DEFINES += -DUSE_UPNP

Makefile.homebrew

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif
1818
LDLIBS += -lpthread -ldl
1919
else
2020
LDFLAGS += -L${SSLROOT}/lib -L${BOOSTROOT}/lib
21-
LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_filesystem -lboost_program_options -lpthread
21+
LDLIBS = -lz -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lpthread
2222
ifeq ($(USE_UPNP),yes)
2323
LDFLAGS += -L${UPNPROOT}/lib
2424
LDLIBS += -lminiupnpc

Makefile.linux

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ifeq ($(USE_UPNP),yes)
4040
endif
4141
LDLIBS += -lpthread -ldl
4242
else
43-
LDLIBS += -lcrypto -lssl -lz -lboost_program_options -lpthread -latomic
43+
LDLIBS += -lssl -lcrypto -lz -lboost_program_options -lpthread -latomic
4444
ifeq ($(USE_UPNP),yes)
4545
LDLIBS += -lminiupnpc
4646
endif

Makefile.osx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ LDFLAGS += -Wl,-dead_strip
77
LDFLAGS += -Wl,-dead_strip_dylibs
88

99
ifeq ($(USE_STATIC),yes)
10-
LDLIBS = -lz /usr/local/lib/libcrypto.a /usr/local/lib/libssl.a /usr/local/lib/libboost_system.a /usr/local/lib/libboost_filesystem.a /usr/local/lib/libboost_program_options.a -lpthread
10+
LDLIBS = -lz /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a /usr/local/lib/libboost_system.a /usr/local/lib/libboost_filesystem.a /usr/local/lib/libboost_program_options.a -lpthread
1111
else
12-
LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_filesystem -lboost_program_options -lpthread
12+
LDLIBS = -lz -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lpthread
1313
endif
1414

1515
ifeq ($(USE_UPNP),yes)

0 commit comments

Comments
 (0)