Allow external builds to use non-gnu compilers
JerryScript-DCO-1.0-Signed-off-by: François Baldassari francois@pebble.com
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ project (Jerry C ASM)
|
|||||||
string(TOUPPER "${PLATFORM}" PLATFORM)
|
string(TOUPPER "${PLATFORM}" PLATFORM)
|
||||||
|
|
||||||
# Compiler configuration
|
# Compiler configuration
|
||||||
if(NOT ("${PLATFORM}" STREQUAL "DARWIN"))
|
if(NOT (("${PLATFORM}" STREQUAL "DARWIN") OR ("${PLATFORM}" STREQUAL "EXTERNAL")))
|
||||||
if(NOT CMAKE_COMPILER_IS_GNUCC)
|
if(NOT CMAKE_COMPILER_IS_GNUCC)
|
||||||
message(FATAL_ERROR "gcc compiler is required")
|
message(FATAL_ERROR "gcc compiler is required")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -17,4 +17,4 @@ include(CMakeForceCompiler)
|
|||||||
set(CMAKE_SYSTEM_NAME EXTERNAL)
|
set(CMAKE_SYSTEM_NAME EXTERNAL)
|
||||||
set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
|
set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
|
||||||
|
|
||||||
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
|
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} ${EXTERNAL_CMAKE_C_COMPILER_ID})
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ jerry:
|
|||||||
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
|
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
|
||||||
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=xtensia-lx106 \
|
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=xtensia-lx106 \
|
||||||
-DEXTERNAL_CMAKE_C_COMPILER=xtensa-lx106-elf-gcc \
|
-DEXTERNAL_CMAKE_C_COMPILER=xtensa-lx106-elf-gcc \
|
||||||
|
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
|
||||||
-DEXTERNAL_BUILD_ENTRY_FILE="$(JERRY_BUILD_FILES)" \
|
-DEXTERNAL_BUILD_ENTRY_FILE="$(JERRY_BUILD_FILES)" \
|
||||||
-DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \
|
-DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \
|
||||||
-DEXTERNAL_LIBC_INTERFACE="$(ESP_INC)" \
|
-DEXTERNAL_LIBC_INTERFACE="$(ESP_INC)" \
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ jerry:
|
|||||||
-DUSE_COMPILER_DEFAULT_LIBC=YES \
|
-DUSE_COMPILER_DEFAULT_LIBC=YES \
|
||||||
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \
|
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \
|
||||||
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
|
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
|
||||||
|
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
|
||||||
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
|
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
|
||||||
-DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
|
-DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ all:
|
|||||||
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
|
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
|
||||||
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
|
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
|
||||||
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
|
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
|
||||||
|
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
|
||||||
-DEXTERNAL_BUILD_ENTRY_FILE=./targets/nuttx-stm32f4/main-nuttx.c \
|
-DEXTERNAL_BUILD_ENTRY_FILE=./targets/nuttx-stm32f4/main-nuttx.c \
|
||||||
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
|
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
|
||||||
-DEXTERNAL_LIBC_INTERFACE=$(NUTTXINC) \
|
-DEXTERNAL_LIBC_INTERFACE=$(NUTTXINC) \
|
||||||
|
|||||||
Reference in New Issue
Block a user