diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index da39181..af9b850 100644 --- a/Makefile.FreeBSD +++ b/Makefile.FreeBSD @@ -10,10 +10,12 @@ CRYPT_PREFIX ?= $(PREFIX) MANDIR ?= /usr/share/man CC ?= cc -CFLAGS := -c -O3 -fno-strict-aliasing -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN $(CFLAGS) +CFLAGS ?= -O3 -flto +CFLAGS += -c -fno-strict-aliasing -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN COUT = -o LN ?= ${CC} -LDFLAGS += -g -flto -pthread -fno-strict-aliasing +LDFLAGS ?= -flto +LDFLAGS += -pthread -fno-strict-aliasing # -lpthreads may be reuiured on some platforms instead of -pthreads # -ldl or -lld may be required for some platforms DCFLAGS ?= -fPIC diff --git a/Makefile.Linux b/Makefile.Linux index 81f0be9..5f74ed6 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -9,11 +9,13 @@ PREFIX ?= 3proxy_ CRYPT_PREFIX ?= $(PREFIX) CC ?= gcc -CFLAGS := -g -fPIC -O3 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -D WITH_UN $(CFLAGS) +CFLAGS ?= -O3 -flto +CFLAGS += -fPIC -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -D WITH_UN COUT = -o LN ?= ${CC} DCFLAGS ?= -LDFLAGS := -fPIC -O3 -fno-strict-aliasing -pthread $(LDFLAGS) +LDFLAGS ?= -flto +LDFLAGS += -fPIC -O3 -fno-strict-aliasing -pthread DLFLAGS ?= -shared DLSUFFICS = .ld.so # -lpthreads may be reuqired on some platforms instead of -pthreads @@ -37,7 +39,7 @@ LIBS ?= -ldl PLUGINS ?= StringsPlugin TrafficPlugin TransparentPlugin FilePlugin OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | $(CC) -x c $(CFLAGS) -o testssl.o - 2>/dev/null && $(CC) $(LDFLAGS) -otestssl testssl.o -lcrypto -lssl 2>/dev/null && rm testssl testssl.o && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl + LIBS += -Wl,-Bstatic -l crypto -l ssl -Wl,-Bdynamic CFLAGS += -DWITH_SSL SSL_OBJS = ssllib$(OBJSUFFICS) ssl$(OBJSUFFICS) endif diff --git a/Makefile.unix b/Makefile.unix index 9a9c664..858e66e 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -12,10 +12,12 @@ MANDIR ?= /usr/share/man CC ?= gcc # you may need -L/usr/pkg/lib for older NetBSD versions -CFLAGS := -g -O2 -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN $(CFLAGS) +CFLAGS ?= -O3 -flto +CFLAGS += -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN COUT = -o LN ?= $(CC) -LDFLAGS ?= -O2 -fno-strict-aliasing -pthread +LDFLAGS ?= -flto +LDFLAGS += -pthread -fno-strict-aliasing # -lpthreads may be reuqired on some platforms instead of -pthreads # -ldl or -lld may be required for some platforms DCFLAGS ?= -fPIC diff --git a/Makefile.win b/Makefile.win index 486e41d..6376c80 100644 --- a/Makefile.win +++ b/Makefile.win @@ -8,13 +8,15 @@ BUILDDIR = ../bin/ CC ?= gcc -CFLAGS := -O2 -s -c -mthreads -DWITH_WSAPOLL $(CFLAGS) +CFLAGS ?= -O3 -flto -fno-strict-aliasing +CFLAGS += -c -mthreads -DWITH_WSAPOLL COUT = -o LN ?= $(CC) -LDFLAGS := -O2 -s -mthreads $(LDFLAGS) +LDFLAGS ?= -flto -fno-strict-aliasing +LDFLAGS += -mthreads DLFLAGS ?= -shared DLSUFFICS = .dll -LIBS := -lws2_32 -lodbc32 -ladvapi32 -luser32 $(LIBS) +LIBS += -lws2_32 -lodbc32 -ladvapi32 -luser32 LIBSPREFIX = -l LIBSSUFFIX = LNOUT = -o