From b35883f5d5f8b8df1642cd1a44d20f9784f294a4 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 24 Mar 2019 17:58:41 -0400
Subject: [PATCH] cmake nuttx use wrapper script to call "make olddefconfig"

- this is a workaround for PATH variables that exceed the maximum cmake custom command length
---
 platforms/nuttx/NuttX/CMakeLists.txt                   |  2 +-
 platforms/nuttx/NuttX/tools/kconfig-tweak              |  2 +-
 .../nuttx/NuttX/tools/px4_nuttx_make_olddefconfig.sh   | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 platforms/nuttx/NuttX/tools/px4_nuttx_make_olddefconfig.sh

diff --git a/platforms/nuttx/NuttX/CMakeLists.txt b/platforms/nuttx/NuttX/CMakeLists.txt
index 472e53437a..0ee99c52c0 100644
--- a/platforms/nuttx/NuttX/CMakeLists.txt
+++ b/platforms/nuttx/NuttX/CMakeLists.txt
@@ -141,7 +141,7 @@ if (NOT config_expanded)
 	add_custom_command(
 		OUTPUT ${NUTTX_DIR}/.config
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config
-		COMMAND PATH=${CMAKE_CURRENT_SOURCE_DIR}/tools:$ENV{PATH} make --no-print-directory --silent -C ${NUTTX_DIR} CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_APPS_DIR="../apps" olddefconfig > nuttx_olddefconfig.log
+		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/px4_nuttx_make_olddefconfig.sh ${NUTTX_DIR}
 		DEPENDS
 			${NUTTX_DEFCONFIG}
 			${NUTTX_DIR}/configs/dummy/Kconfig
diff --git a/platforms/nuttx/NuttX/tools/kconfig-tweak b/platforms/nuttx/NuttX/tools/kconfig-tweak
index 4f950fd38b..f6d638dc61 100755
--- a/platforms/nuttx/NuttX/tools/kconfig-tweak
+++ b/platforms/nuttx/NuttX/tools/kconfig-tweak
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-echo "DEBUG: kconfiglib kconfig-tweak wrapper, arguments: ${@}"
+#echo "DEBUG: kconfiglib kconfig-tweak wrapper, arguments: ${@}"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 export APPSDIR="`pwd`/../apps"
diff --git a/platforms/nuttx/NuttX/tools/px4_nuttx_make_olddefconfig.sh b/platforms/nuttx/NuttX/tools/px4_nuttx_make_olddefconfig.sh
new file mode 100755
index 0000000000..069bbe3b2a
--- /dev/null
+++ b/platforms/nuttx/NuttX/tools/px4_nuttx_make_olddefconfig.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+NUTTX_DIR=${1}
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# update PATH to include kconfiglib scripts
+export PATH=${DIR}:${PATH}
+
+make --no-print-directory --silent -C ${NUTTX_DIR} CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_APPS_DIR="../apps" olddefconfig > nuttx_olddefconfig.log