YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing toolchain_external.cmake build configuration: generalizing it from Nuttx OS.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
This commit is contained in:
Ruben Ayrapetyan
2015-05-08 20:09:04 +03:00
parent 290eb2f9b0
commit 2852d93af6
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -3
View File
@@ -76,8 +76,8 @@ project (Jerry CXX C ASM)
option(STRIP_RELEASE_BINARY "Strip symbols from release binaries" OFF) option(STRIP_RELEASE_BINARY "Strip symbols from release binaries" OFF)
set(MCU_SCRIPT_FILE "tests/blinky.js" CACHE STRING "Script to run on MCU") set(MCU_SCRIPT_FILE "tests/blinky.js" CACHE STRING "Script to run on MCU")
elseif("${PLATFORM}" STREQUAL "NUTTX") elseif("${PLATFORM}" STREQUAL "EXTERNAL")
set(PLATFORM_EXT "NUTTX") set(PLATFORM_EXT "${CMAKE_SYSTEM_VERSION}")
set(EXTERNAL_BUILD TRUE) set(EXTERNAL_BUILD TRUE)
set(EXTERNAL_LIBC_INTERFACE "UNDEFINED" CACHE STRING "Path to external libc include directory") set(EXTERNAL_LIBC_INTERFACE "UNDEFINED" CACHE STRING "Path to external libc include directory")
@@ -95,7 +95,7 @@ project (Jerry CXX C ASM)
set(USE_JERRY_LIBC TRUE) set(USE_JERRY_LIBC TRUE)
# Jerry's libc doesn't support Nuttx platform # Jerry's libc doesn't support Nuttx platform
if(${PLATFORM} STREQUAL "NUTTX") if(${PLATFORM_EXT} STREQUAL "NUTTX")
message(FATAL_ERROR "Nuttx build doesn't support Jerry's libc implementation") message(FATAL_ERROR "Nuttx build doesn't support Jerry's libc implementation")
endif() endif()
else() else()
Makefile
+1
View File
@@ -167,6 +167,7 @@ $(BUILD_DIRS_NUTTX): prerequisites
cmake \ cmake \
-DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) \ -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) \
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \ -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
-DEXTERNAL_TARGET_NAME=NUTTX \
-DEXTERNAL_LIBC_INTERFACE="${EXTERNAL_LIBC_INTERFACE}" \ -DEXTERNAL_LIBC_INTERFACE="${EXTERNAL_LIBC_INTERFACE}" \
-DEXTERNAL_LIBS_INTERFACE="${EXTERNAL_LIBS_INTERFACE}" \ -DEXTERNAL_LIBS_INTERFACE="${EXTERNAL_LIBS_INTERFACE}" \
-DEXTERNAL_CMAKE_C_COMPILER="${EXTERNAL_C_COMPILER}" \ -DEXTERNAL_CMAKE_C_COMPILER="${EXTERNAL_C_COMPILER}" \
build/configs/toolchain_external.cmake
+2 -1
View File
@@ -14,7 +14,8 @@
include(CMakeForceCompiler) include(CMakeForceCompiler)
set(CMAKE_SYSTEM_NAME NUTTX) set(CMAKE_SYSTEM_NAME EXTERNAL)
set(CMAKE_SYSTEM_VERSION ${EXTERNAL_TARGET_NAME})
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU) CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
CMAKE_FORCE_CXX_COMPILER(${EXTERNAL_CMAKE_CXX_COMPILER} GNU) CMAKE_FORCE_CXX_COMPILER(${EXTERNAL_CMAKE_CXX_COMPILER} GNU)
jerry-core/CMakeLists.txt
+7 -3
View File
@@ -83,8 +83,12 @@ project (JerryCore CXX C ASM)
math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024") math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
set(DEFINES_JERRY_NUTTX CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K}) set(DEFINES_JERRY_NUTTX CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
# MCU # MCU
math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024") # stm32f3
set(DEFINES_JERRY_MCU CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K}) math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
set(DEFINES_JERRY_MCU_STM32F3 CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
# stm32f4
math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
set(DEFINES_JERRY_MCU_STM32F4 CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
# Include directories # Include directories
set(INCLUDE_CORE set(INCLUDE_CORE
@@ -134,7 +138,7 @@ project (JerryCore CXX C ASM)
endif() endif()
# Platform-specific configuration # Platform-specific configuration
set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_JERRY_${PLATFORM}}) set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_JERRY_${PLATFORM_EXT}})
# Targets declaration # Targets declaration
function(declare_targets_for_build_mode BUILD_MODE) function(declare_targets_for_build_mode BUILD_MODE)