Skip to content

Commit 05e7a83

Browse files
author
François Baldassari
committed
Allow external builds to use non-gnu compilers
JerryScript-DCO-1.0-Signed-off-by: François Baldassari [email protected]
1 parent 7b047d4 commit 05e7a83

File tree

5 files changed

+5
-2
lines changed

5 files changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ project (Jerry C ASM)
2020
string(TOUPPER "${PLATFORM}" PLATFORM)
2121

2222
# Compiler configuration
23-
if(NOT ("${PLATFORM}" STREQUAL "DARWIN"))
23+
if(NOT (("${PLATFORM}" STREQUAL "DARWIN") OR ("${PLATFORM}" STREQUAL "EXTERNAL")))
2424
if(NOT CMAKE_COMPILER_IS_GNUCC)
2525
message(FATAL_ERROR "gcc compiler is required")
2626
endif()

build/configs/toolchain_external.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ include(CMakeForceCompiler)
1717
set(CMAKE_SYSTEM_NAME EXTERNAL)
1818
set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
1919

20-
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
20+
CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} ${EXTERNAL_CMAKE_C_COMPILER_ID})

targets/esp8266/Makefile.esp8266

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jerry:
6464
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
6565
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=xtensia-lx106 \
6666
-DEXTERNAL_CMAKE_C_COMPILER=xtensa-lx106-elf-gcc \
67+
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
6768
-DEXTERNAL_BUILD_ENTRY_FILE="$(JERRY_BUILD_FILES)" \
6869
-DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \
6970
-DEXTERNAL_LIBC_INTERFACE="$(ESP_INC)" \

targets/mbedk64f/Makefile.mbedk64f

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jerry:
4444
-DUSE_COMPILER_DEFAULT_LIBC=YES \
4545
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \
4646
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
47+
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
4748
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
4849
-DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
4950

targets/nuttx-stm32f4/Makefile.nuttx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ all:
4242
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
4343
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
4444
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
45+
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
4546
-DEXTERNAL_BUILD_ENTRY_FILE=./targets/nuttx-stm32f4/main-nuttx.c \
4647
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
4748
-DEXTERNAL_LIBC_INTERFACE=$(NUTTXINC) \

0 commit comments

Comments
 (0)