From 770d1666f8ed998e3eebbc2359d15ec525ad619c Mon Sep 17 00:00:00 2001
From: Curtis Vogt <curtis.vogt@gmail.com>
Date: Wed, 13 Jan 2021 12:55:10 -0600
Subject: [PATCH] MbedTLS source build fixes (#39131)

---
 deps/mbedtls.mk      | 4 ++--
 deps/tools/common.mk | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk
index 494771466ad00..83085ed2d2709 100644
--- a/deps/mbedtls.mk
+++ b/deps/mbedtls.mk
@@ -24,7 +24,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted: $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz
 	mkdir -p $(dir $@) && \
 	$(TAR) -C $(dir $@) --strip-components 1 -xf $<
 	# Force-enable MD4
-	sed "s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" -i $(SRCCACHE)/$(MBEDTLS_SRC)/include/mbedtls/config.h
+	sed -i.org "s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" $(SRCCACHE)/$(MBEDTLS_SRC)/include/mbedtls/config.h
 	touch -c $(SRCCACHE)/$(MBEDTLS_SRC)/CMakeLists.txt # old target
 	echo 1 > $@
 
@@ -37,7 +37,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied: $(SRCCACHE)/$(MBE
 	# are it will be included at least in their next minor release (2.26.0?).
 	cd $(SRCCACHE)/$(MBEDTLS_SRC) && \
 		patch -p1 -f < $(SRCDIR)/patches/mbedtls-cmake-findpy.patch
-	echo 1 > @$
+	echo 1 > $@
 
 $(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: \
 	$(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied
diff --git a/deps/tools/common.mk b/deps/tools/common.mk
index 35effcb75bd96..a2a552830c495 100644
--- a/deps/tools/common.mk
+++ b/deps/tools/common.mk
@@ -23,6 +23,10 @@ CMAKE_CXX_ARG := $(CXX_ARG)
 CMAKE_COMMON := -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) -DCMAKE_PREFIX_PATH=$(build_prefix)
 CMAKE_COMMON += -DCMAKE_INSTALL_LIBDIR=$(build_libdir) -DCMAKE_INSTALL_BINDIR=$(build_bindir)
 CMAKE_COMMON += -DLIB_INSTALL_DIR=$(build_shlibdir)
+ifeq ($(OS), Darwin)
+CMAKE_COMMON += -DCMAKE_MACOSX_RPATH=1
+endif
+
 ifneq ($(VERBOSE), 0)
 CMAKE_COMMON += -DCMAKE_VERBOSE_MAKEFILE=ON
 endif