From 65db853abc9ade0ddd8be5357084a5bda11ea6e0 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Thu, 24 Jan 2019 09:01:11 -0800 Subject: [PATCH] [nrf52840] fix build with `DISABLE_BUILTIN_MBEDTLS=1` (#3497) --- third_party/jlink/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/third_party/jlink/Makefile.am b/third_party/jlink/Makefile.am index c3197d85c..a3f08a95a 100644 --- a/third_party/jlink/Makefile.am +++ b/third_party/jlink/Makefile.am @@ -29,15 +29,15 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am lib_LIBRARIES = libjlinkrtt.a - + libjlinkrtt_a_CPPFLAGS = \ -I$(top_srcdir)/third_party/jlink/SEGGER_RTT_V640/RTT \ $(NULL) - + libjlinkrtt_a_SOURCES = \ SEGGER_RTT_V640/RTT/SEGGER_RTT.c \ $(NULL) - + noinst_HEADERS = \ SEGGER_RTT_V640/RTT/SEGGER_RTT.h \ SEGGER_RTT_V640/RTT/SEGGER_RTT_Conf.h \ @@ -45,10 +45,13 @@ noinst_HEADERS = \ if OPENTHREAD_EXAMPLES_NRF52840 libjlinkrtt_a_CPPFLAGS += \ + -DNRF52840_XXAA \ -DSEGGER_RTT_CONFIG_H=\"$(top_srcdir)/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT_Conf.h\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/third_party/NordicSemiconductor/dependencies \ -I$(top_srcdir)/third_party/NordicSemiconductor/libraries/app_error \ + -I$(top_srcdir)/third_party/NordicSemiconductor/nrfx/mdk \ + -I$(top_srcdir)/third_party/NordicSemiconductor/cmsis \ $(NULL) endif