From 05e7a837c44cc3422178eb7dd0c90835b344fdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Baldassari?= Date: Wed, 9 Mar 2016 17:38:06 -0800 Subject: [PATCH] Allow external builds to use non-gnu compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JerryScript-DCO-1.0-Signed-off-by: François Baldassari francois@pebble.com --- CMakeLists.txt | 2 +- build/configs/toolchain_external.cmake | 2 +- targets/esp8266/Makefile.esp8266 | 1 + targets/mbedk64f/Makefile.mbedk64f | 1 + targets/nuttx-stm32f4/Makefile.nuttx | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9431ceac4..f6421cbf6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ project (Jerry C ASM) string(TOUPPER "${PLATFORM}" PLATFORM) # Compiler configuration - if(NOT ("${PLATFORM}" STREQUAL "DARWIN")) + if(NOT (("${PLATFORM}" STREQUAL "DARWIN") OR ("${PLATFORM}" STREQUAL "EXTERNAL"))) if(NOT CMAKE_COMPILER_IS_GNUCC) message(FATAL_ERROR "gcc compiler is required") endif() diff --git a/build/configs/toolchain_external.cmake b/build/configs/toolchain_external.cmake index 30f004d71..f1e25b2be 100644 --- a/build/configs/toolchain_external.cmake +++ b/build/configs/toolchain_external.cmake @@ -17,4 +17,4 @@ include(CMakeForceCompiler) set(CMAKE_SYSTEM_NAME EXTERNAL) 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}) diff --git a/targets/esp8266/Makefile.esp8266 b/targets/esp8266/Makefile.esp8266 index 7abf4adfe..4edc315d4 100644 --- a/targets/esp8266/Makefile.esp8266 +++ b/targets/esp8266/Makefile.esp8266 @@ -64,6 +64,7 @@ jerry: -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \ -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=xtensia-lx106 \ -DEXTERNAL_CMAKE_C_COMPILER=xtensa-lx106-elf-gcc \ + -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \ -DEXTERNAL_BUILD_ENTRY_FILE="$(JERRY_BUILD_FILES)" \ -DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \ -DEXTERNAL_LIBC_INTERFACE="$(ESP_INC)" \ diff --git a/targets/mbedk64f/Makefile.mbedk64f b/targets/mbedk64f/Makefile.mbedk64f index 45345339e..e17da3a54 100644 --- a/targets/mbedk64f/Makefile.mbedk64f +++ b/targets/mbedk64f/Makefile.mbedk64f @@ -44,6 +44,7 @@ jerry: -DUSE_COMPILER_DEFAULT_LIBC=YES \ -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \ -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \ + -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP) diff --git a/targets/nuttx-stm32f4/Makefile.nuttx b/targets/nuttx-stm32f4/Makefile.nuttx index b9469b9ae..966c399bd 100644 --- a/targets/nuttx-stm32f4/Makefile.nuttx +++ b/targets/nuttx-stm32f4/Makefile.nuttx @@ -42,6 +42,7 @@ all: -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \ -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \ -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_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DEXTERNAL_LIBC_INTERFACE=$(NUTTXINC) \