kore

An easy to use, scalable and secure web application framework for writing web APIs in C.
Commits | Files | Refs | README | LICENSE | git clone https://git.kore.io/kore.git

commit 960730a062c23f30321956169fa6c1b97ff669c4
parent fa97544f01e9c9bf0a3f708334ba777e51c80ddc
Author: Joris Vink <joris@coders.se>
Date:   Wed, 27 Oct 2021 22:28:08 +0200

On MacOS put the OpenSSL flags under FEATURES_INC.

Use this to pick them up automatically for kodev.

Diffstat:
Makefile | 4+++-
src/cli.c | 6------
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile @@ -132,8 +132,10 @@ ifneq ("$(SANITIZE)", "") endif ifeq ("$(OSNAME)", "darwin") - CFLAGS+=$(shell pkg-config openssl --cflags) + OSSL_INCL=$(shell pkg-config openssl --cflags) + CFLAGS+=$(OSSL_INCL) LDFLAGS+=$(shell pkg-config openssl --libs) + FEATURES_INC+=$(OSSL_INCL) S_SRC+=src/bsd.c else ifeq ("$(OSNAME)", "linux") CFLAGS+=-D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 diff --git a/src/cli.c b/src/cli.c @@ -2017,12 +2017,6 @@ cli_build_flags_common(struct buildopt *bopt, struct cli_buf *buf) else cli_buf_appendf(buf, "-I%s/include ", bopt->kore_source); -#if defined(__MACH__) - /* Add default openssl include path from homebrew / ports under OSX. */ - cli_buf_appendf(buf, "-I/opt/local/include "); - cli_buf_appendf(buf, "-I/usr/local/opt/openssl/include "); - cli_buf_appendf(buf, "-I/opt/homebrew/opt/openssl/include "); -#endif if (bopt == NULL || bopt->single_binary == 0) { cli_kore_load_file("features", bopt, &data, &len); cli_buf_append(buf, data, len);