From 43569a93cc42e7839fe94f8018fa3257ed89496e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 31 Jul 2015 15:37:29 +0200 Subject: [PATCH] Use #ifdef rather than patch for target_config.h --- include/mbedtls/config.h | 4 ++++ yotta/data/adjust-config.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 00daa1119..a17faa150 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -2421,6 +2421,10 @@ /* \} name SECTION: Module configuration options */ +#if defined(TARGET_LIKE_MBED) +#include "mbedtls/target_config.h" +#endif + #include "check_config.h" #endif /* MBEDTLS_CONFIG_H */ diff --git a/yotta/data/adjust-config.sh b/yotta/data/adjust-config.sh index 1a2fcb6c3..1c10733d4 100755 --- a/yotta/data/adjust-config.sh +++ b/yotta/data/adjust-config.sh @@ -68,5 +68,3 @@ conf unset MBEDTLS_SSL_PROTO_SSL3 conf unset MBEDTLS_SSL_PROTO_TLS1 conf unset MBEDTLS_SSL_PROTO_TLS1_1 conf unset MBEDTLS_SSL_TRUNCATED_HMAC - -perl -pi -e 's/#include "check_config.h"/#include "target_config.h"\n$&/' $FILE