build: Fix mistake while testing TARGET_BOARD (#1892)

Preprocessor can't use == on strings", so new symbols are introduced to test configurations at build time. Note, this mistake was harmless because there weren't any spefic parts among boards, but this will change in upcoming change. Change-Id: I45d87cccc086af05661eaf7b762a4a0274fb2ede Relate-to: rzr/webthing-iotjs#3 Forwarded: #1892 IoT.js-DCO-1.0-Signed-off-by: Philippe Coval p.coval@samsung.com
jerryscript-project · Jun 20, 2019 · b266bf9 · b266bf9
1 parent 3eeb8f2
commit b266bf9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,6 +125,9 @@ endif()
 
 # Add board-dependant flags
 iotjs_add_compile_flags(-DTARGET_BOARD=${TARGET_BOARD})
+string(TOUPPER ${TARGET_BOARD} TARGET_BOARD_UPPER)
+string(CONCAT TARGET_BOARD_SYMBOL "TARGET_BOARD_" ${TARGET_BOARD_UPPER})
+iotjs_add_compile_flags(-D${TARGET_BOARD_SYMBOL}=1)
 
 if("${TARGET_BOARD}" STREQUAL "artik05x")
   iotjs_add_compile_flags(-mcpu=cortex-r4 -mfpu=vfp3)

diff --git a/src/modules/nuttx/iotjs_module_stm32f7nucleo-nuttx.c b/src/modules/nuttx/iotjs_module_stm32f7nucleo-nuttx.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#if defined(__NUTTX__) && (TARGET_BOARD == stm32f7nucleo)
+#if defined(__NUTTX__) && defined(TARGET_BOARD_STM32F7NUCLEO)
 
 #include "iotjs_systemio-nuttx.h"
 #include "stm32_gpio.h"

diff --git a/src/platform/nuttx/iotjs_systemio-nuttx.c b/src/platform/nuttx/iotjs_systemio-nuttx.c
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#if defined(__NUTTX__) && \
-    (TARGET_BOARD == stm32f4dis || TARGET_BOARD == stm32f7nucleo)
+#if defined(__NUTTX__) && (defined(TARGET_BOARD_STM32F4DIS) || \
+                           (defined(TARGET_BOARD_STM32F7NUCLEO)))
 
 #include <stdint.h>