From 3a9d91a9bb2e5766d35ada7d83cafb7d81ac174b Mon Sep 17 00:00:00 2001 From: smlng Date: Tue, 19 Dec 2017 12:22:48 +0100 Subject: [PATCH] pkg/jerryscript: allow build with non-gnu toolchain, i.e. llvm --- pkg/jerryscript/Makefile.jerryscript | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/jerryscript/Makefile.jerryscript b/pkg/jerryscript/Makefile.jerryscript index f760fd159a..2f11a8c48a 100644 --- a/pkg/jerryscript/Makefile.jerryscript +++ b/pkg/jerryscript/Makefile.jerryscript @@ -2,9 +2,9 @@ BUILD_DIR ?= $(CURDIR)/riot JERRYHEAP ?= 16 - EXT_CFLAGS :=-D__TARGET_RIOT +EXT_CFLAGS :=-D__TARGET_RIOT - EXT_CFLAGS += $(CFLAGS) +EXT_CFLAGS += $(CFLAGS) .PHONY: libjerry riot-jerry flash clean @@ -13,16 +13,16 @@ JERRYHEAP ?= 16 libjerry: mkdir -p $(BUILD_DIR) cmake -B$(BUILD_DIR) -H./ \ + -DCMAKE_SYSTEM_NAME=RIOT \ + -DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \ + -DCMAKE_C_COMPILER=$(CC) \ + -DCMAKE_C_COMPILER_WORKS=TRUE \ -DENABLE_LTO=OFF \ -DFEATURE_VALGRIND=OFF \ - -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \ - -DJERRY_LIBC=OFF \ - -DJERRY_CMDLINE=OFF \ - -DJERRY_LIBM=OFF \ -DENABLE_ALL_IN_ONE=OFF \ - -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR="$(MCPU)" \ - -DEXTERNAL_CMAKE_C_COMPILER=$(CC) \ - -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \ + -DJERRY_LIBC=OFF \ + -DJERRY_LIBM=OFF \ + -DJERRY_CMDLINE=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)