commit 616485854ecfec1f228ebe7fb2bccec4a536e915
author Jaeden Amero <jaeden.amero@arm.com> Wed Mar 28 15:36:01 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Wed Mar 28 15:36:01 2018 +0100
tree 0f1b616457f4f526333ad5a09529d545cac04280
parent 478baecc06fe3a7fd67fc5ffb173831b443a4aee
parent 09d787f2fc3cf910d57294382aed5a898c3e1823

Merge remote-tracking branch 'upstream-public/pr/1469' into mbedtls-2.1-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5b647f5..472d84a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
    * Add missing dependencies for MBEDTLS_HAVE_TIME_DATE and
      MBEDTLS_VERSION_FEATURES in test suites. Contributed by Deomid Ryabkov.
      Fixes #1299, #1475.
+   * Fix dynamic library building process with Makefile on Mac OS X. Fixed by
+     mnacamura.
 
 Changes
    * Improve testing in configurations that omit certain hashes or

library/Makefile

diff --git a/library/Makefile b/library/Makefile
index de51e58..8e651f5 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -101,9 +101,9 @@
 	echo "  LN    $@ -> $<"
 	ln -sf $< $@
 
-libmbedtls.dylib: $(OBJS_TLS)
+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib
 	echo "  LD    $@"
-	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
+	$(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
 
 libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
 	echo "  LD    $@"
@@ -124,9 +124,9 @@
 	echo "  LN    $@ -> $<"
 	ln -sf $< $@
 
-libmbedx509.dylib: $(OBJS_X509)
+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib
 	echo "  LD    $@"
-	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
+	$(CC) -dynamiclib -L. -lmbedcrypto  $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
 
 libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
 	echo "  LD    $@"