From fbf110f6be1ea0930013cc09d83be89aabcf2e43 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Mon, 22 Jun 2020 11:46:59 -0700
Subject: [PATCH] Use EXTRAFLAGS instead of EXTRADEFINES

---
 Tools/px4_developer.mk.example       | 2 +-
 platforms/nuttx/NuttX/CMakeLists.txt | 2 +-
 platforms/nuttx/NuttX/Make.defs.in   | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Tools/px4_developer.mk.example b/Tools/px4_developer.mk.example
index 42b9bd6c30..54c3024831 100644
--- a/Tools/px4_developer.mk.example
+++ b/Tools/px4_developer.mk.example
@@ -1,5 +1,5 @@
 $(info px4_developer.mk inclded)
 ifeq ($(UAVCAN_BL_OVERRIDE),y)
 $(info **************************  UAVCAN BOOT LOADERS built for In place application Debugging ***************************************)
-export EXTRADEFINES +=-DDEBUG_APPLICATION_INPLACE
+export EXTRAFLAGS +=-DDEBUG_APPLICATION_INPLACE
 endif
\ No newline at end of file
diff --git a/platforms/nuttx/NuttX/CMakeLists.txt b/platforms/nuttx/NuttX/CMakeLists.txt
index 141480910a..a58fcd15b7 100644
--- a/platforms/nuttx/NuttX/CMakeLists.txt
+++ b/platforms/nuttx/NuttX/CMakeLists.txt
@@ -294,7 +294,7 @@ function(add_nuttx_dir nuttx_lib nuttx_lib_dir kernel extra)
 
 	add_custom_command(OUTPUT ${NUTTX_DIR}/${nuttx_lib_dir}/lib${nuttx_lib}.a
 		COMMAND find ${nuttx_lib_dir} -type f -name *.o -delete
-		COMMAND make -C ${nuttx_lib_dir} ${nuttx_build_options} --no-print-directory all TOPDIR=${NUTTX_DIR} KERNEL=${kernel} EXTRADEFINES=${extra}
+		COMMAND make -C ${nuttx_lib_dir} ${nuttx_build_options} --no-print-directory all TOPDIR=${NUTTX_DIR} KERNEL=${kernel} EXTRAFLAGS=${extra}
 		DEPENDS
 			${nuttx_lib_files}
 			nuttx_context ${NUTTX_DIR}/include/nuttx/config.h ${NUTTX_DIR}/include/nuttx/version.h
diff --git a/platforms/nuttx/NuttX/Make.defs.in b/platforms/nuttx/NuttX/Make.defs.in
index cc1b3e681c..4c07b8358a 100644
--- a/platforms/nuttx/NuttX/Make.defs.in
+++ b/platforms/nuttx/NuttX/Make.defs.in
@@ -48,7 +48,6 @@ else
   ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)flash.ld
 endif
 
-
 CC = ${CMAKE_C_COMPILER}
 CXX = ${CMAKE_CXX_COMPILER}
 CPP = ${CMAKE_C_COMPILER} -E
@@ -94,6 +93,8 @@ FLAGS = $(MAXOPTIMIZATION) -g2 \
 	-Wno-unused-parameter \
 	-Wpointer-arith
 
+FLAGS += $(EXTRAFLAGS)
+
 # enable precise stack overflow tracking
 ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
 	FLAGS += -finstrument-functions -ffixed-r10
@@ -132,7 +133,7 @@ CXXFLAGS = $(ARCHXXINCLUDES) \
 	-Wno-double-promotion \
 	-Wno-missing-declarations
 
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 ASMEXT = .S