From 310766b2704c0dbe69713bb4fa486de61d6c1a4d Mon Sep 17 00:00:00 2001 From: James Yonan Date: Sat, 22 Jun 2019 22:41:54 -0600 Subject: [PATCH] build: added MTLS_DIST setting MTLS_DIST=path -- use user-specified mbedTLS distribution Signed-off-by: James Yonan --- scripts/build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index a4d46e6a..8f251677 100755 --- a/scripts/build +++ b/scripts/build @@ -35,6 +35,7 @@ if [ -z "$1" ]; then echo " MTLS_SYS=1 -- use system mbedTLS" echo " MTLS_PATH=path -- use user specified mbedTLS source folder" echo " MTLS_LIBS=ldflags -- user specific mbedTLS LDFLAGS" + echo " MTLS_DIST=path -- use user-specified mbedTLS distribution" echo " MA_HYBRID=1 -- use mbedTLS/AppleCrypto hybrid" echo " OPENSSL_DIST= -- specify custom OpenSSL build" echo " NOSSL=1 -- don't include OpenSSL" @@ -123,7 +124,12 @@ FLAGS="$FLAGS -Wno-sign-compare -Wno-unused-parameter" #fi # MbedTLS -if [ "$MTLS_SYS" = "1" ]; then +if [ -n "$MTLS_DIST" ]; then + CPPFLAGS="$CPPFLAGS -DUSE_MBEDTLS -I$MTLS_DIST/include" + LIBDIRS="$LIBDIRS -L$MTLS_DIST/library" + LIBS="$LIBS -lmbedtls -lmbedx509 -lmbedcrypto" + MTLS=1 +elif [ "$MTLS_SYS" = "1" ]; then CPPFLAGS="$CPPFLAGS -DUSE_MBEDTLS" LIBS="$LIBS -lmbedtls -lmbedx509 -lmbedcrypto" elif [ "$MTLS" = "1" ]; then