Skip to content

Commit 0927888

Browse files
committed
External build fix
Added generic build for none linux platforms, as nuttx has be removed by #330 JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected] JerryScript-DCO-1.0-Signed-off-by: SaeHie Park [email protected]
1 parent aa415c6 commit 0927888

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ project (Jerry CXX C ASM)
7878
option(STRIP_RELEASE_BINARY "Strip symbols from release binaries" OFF)
7979
set(MCU_SCRIPT_FILE "tests/blinky.js" CACHE STRING "Script to run on MCU")
8080
elseif("${PLATFORM}" STREQUAL "EXTERNAL")
81-
set(PLATFORM_EXT "${CMAKE_SYSTEM_VERSION}")
81+
set(PLATFORM_EXT "EXTERNAL")
8282
set(EXTERNAL_BUILD TRUE)
8383

8484
set(EXTERNAL_LIBC_INTERFACE "UNDEFINED" CACHE STRING "Path to external libc include directory")
8585
set(EXTERNAL_LIBS_INTERFACE "UNDEFINED" CACHE STRING "Path to external libraries' include directory")
8686
else()
87-
message(FATAL_ERROR "Platform is not supported")
87+
message(FATAL_ERROR "Platform '${PLATFORM}' is not supported")
8888
endif()
8989

9090
# Intermediate files
@@ -182,6 +182,14 @@ project (Jerry CXX C ASM)
182182
"COMPACT_PROFILE"
183183
"COMPACT_PROFILE_MINIMAL")
184184

185+
# External
186+
set(MODIFIERS_LISTS_EXTERNAL
187+
"FULL_PROFILE"
188+
"COMPACT_PROFILE"
189+
"COMPACT_PROFILE_MINIMAL"
190+
"FULL_PROFILE MEMORY_STATISTICS"
191+
"COMPACT_PROFILE MEMORY_STATISTICS")
192+
185193
# Compiler / Linker flags
186194
set(COMPILE_FLAGS_JERRY "-fno-builtin")
187195
set(LINKER_FLAGS_COMMON "-Wl,-z,noexecstack")
@@ -366,28 +374,20 @@ project (Jerry CXX C ASM)
366374
endif()
367375
endif()
368376
else()
369-
set(MAIN_MODULE_TARGET_NAME ${TARGET_NAME}.${PLATFORM_L}.main)
370-
add_library(${MAIN_MODULE_TARGET_NAME} ${SOURCE_JERRY_STANDALONE_MAIN})
371-
set_property(TARGET ${MAIN_MODULE_TARGET_NAME}
372-
PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
373-
target_compile_definitions(${MAIN_MODULE_TARGET_NAME} PRIVATE ${DEFINES_JERRY})
374-
target_include_directories(${MAIN_MODULE_TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
375-
target_include_directories(${MAIN_MODULE_TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
376-
target_include_directories(${MAIN_MODULE_TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
377-
378377
add_custom_target(${TARGET_NAME} ALL)
379-
add_dependencies(${TARGET_NAME} ${MAIN_MODULE_TARGET_NAME} ${FDLIBM_TARGET_NAME}${CORE_TARGET_NAME})
380378

379+
add_dependencies(${TARGET_NAME} ${FDLIBM_TARGET_NAME} ${CORE_TARGET_NAME})
381380
add_custom_command(TARGET ${TARGET_NAME}
382381
POST_BUILD
383382
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/${TARGET_NAME}
384-
COMMAND echo
385-
$<TARGET_FILE:${MAIN_MODULE_TARGET_NAME}>
386-
$<TARGET_FILE:${FDLIBM_TARGET_NAME}>
387-
$<TARGET_FILE:${CORE_TARGET_NAME}> > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list)
383+
COMMAND echo $<TARGET_FILE:${FDLIBM_TARGET_NAME}> > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list
384+
COMMAND echo $<TARGET_FILE:${CORE_TARGET_NAME}> >> ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list)
388385

389386
if(${USE_JERRY_LIBC})
390387
add_dependencies(${TARGET_NAME} ${LIBC_TARGET_NAME})
388+
add_custom_command(TARGET ${TARGET_NAME}
389+
POST_BUILD
390+
COMMAND echo $<TARGET_FILE:${LIBC_TARGET_NAME}> >> ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list)
391391
endif()
392392

393393
add_cppcheck_target(${TARGET_NAME})

build/configs/toolchain_external.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
include(CMakeForceCompiler)
1616

1717
set(CMAKE_SYSTEM_NAME EXTERNAL)
18-
set(CMAKE_SYSTEM_VERSION ${EXTERNAL_TARGET_NAME})
18+
set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
1919

2020
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
2121
CMAKE_FORCE_CXX_COMPILER(${EXTERNAL_CMAKE_CXX_COMPILER} GNU)

0 commit comments

Comments
 (0)