File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted: $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz
24
24
mkdir -p $(dir $@ ) && \
25
25
$(TAR ) -C $(dir $@ ) --strip-components 1 -xf $<
26
26
# Force-enable MD4
27
- sed " s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" -i $(SRCCACHE ) /$(MBEDTLS_SRC ) /include/mbedtls/config.h
27
+ sed -i.org " s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" $(SRCCACHE ) /$(MBEDTLS_SRC ) /include/mbedtls/config.h
28
28
touch -c $(SRCCACHE ) /$(MBEDTLS_SRC ) /CMakeLists.txt # old target
29
29
echo 1 > $@
30
30
@@ -37,7 +37,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied: $(SRCCACHE)/$(MBE
37
37
# are it will be included at least in their next minor release (2.26.0?).
38
38
cd $(SRCCACHE ) /$(MBEDTLS_SRC ) && \
39
39
patch -p1 -f < $(SRCDIR ) /patches/mbedtls-cmake-findpy.patch
40
- echo 1 > @$
40
+ echo 1 > $@
41
41
42
42
$(BUILDDIR ) /$(MBEDTLS_SRC ) /build-configured : \
43
43
$(SRCCACHE ) /$(MBEDTLS_SRC ) /mbedtls-cmake-findpy.patch-applied
Original file line number Diff line number Diff line change @@ -23,6 +23,10 @@ CMAKE_CXX_ARG := $(CXX_ARG)
23
23
CMAKE_COMMON := -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix ) -DCMAKE_PREFIX_PATH=$(build_prefix )
24
24
CMAKE_COMMON += -DCMAKE_INSTALL_LIBDIR=$(build_libdir ) -DCMAKE_INSTALL_BINDIR=$(build_bindir )
25
25
CMAKE_COMMON += -DLIB_INSTALL_DIR=$(build_shlibdir )
26
+ ifeq ($(OS ) , Darwin)
27
+ CMAKE_COMMON += -DCMAKE_MACOSX_RPATH=1
28
+ endif
29
+
26
30
ifneq ($(VERBOSE ) , 0)
27
31
CMAKE_COMMON += -DCMAKE_VERBOSE_MAKEFILE=ON
28
32
endif
You can’t perform that action at this time.
0 commit comments