MbedTLS source build fixes (JuliaLang#39131)

halleysfifthinc · Jan 13, 2021 · 492096f · 492096f
1 parent c3acba1
commit 492096f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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