upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUILD: makefile: clean the wolfssl include and lib generation rules

Browse source 
The default include paths for wolfssl didn't match the explicit pattern
one. This was causing some confusion about what to look for, complexifying
the rules and making /usr/local/include to be automatically included if a
path was not set.

Let's just proceed as we usually do, i.e. pass -I only when a path is
specified, so that it works similarly to openssl. Let's also simplify
the LDFLAG rule at the same time.

This may be backported to 2.7 to ease testing of wolfssl.
This commit is contained in:
Willy Tarreau 2022-12-14 18:18:41 +01:00
parent bc2f3934f9
commit 4f1890e882
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -579,15 +579,8 @@ OPTIONS_OBJS += src/ssl_sock.o src/ssl_ckch.o src/ssl_sample.o src/ssl_crtlist.
endif
ifneq ($(USE_OPENSSL_WOLFSSL),)
ifneq ($(WOLFSSL_INC),)
OPTIONS_CFLAGS += -I$(WOLFSSL_INC) -I$(WOLFSSL_INC)/wolfssl
else
OPTIONS_CFLAGS += -I/usr/local/include/wolfssl -I/usr/local/include/wolfssl/openssl -I/usr/local/include
endif
ifneq ($(WOLFSSL_LIB),)
OPTIONS_LDFLAGS += -L$(WOLFSSL_LIB)
endif
OPTIONS_LDFLAGS += -lwolfssl
OPTIONS_CFLAGS += $(if $(WOLFSSL_INC),-I$(WOLFSSL_INC) -I$(WOLFSSL_INC)/wolfssl)
OPTIONS_LDFLAGS += $(if $(WOLFSSL_LIB),-L$(WOLFSSL_LIB)) -lwolfssl
endif
ifneq ($(USE_ENGINE),)