diff --git a/examples/javascript/Makefile b/examples/javascript/Makefile index 19429f011b15fdddc8b014d1aa95f0a42ddca0a7..042975bf976d01dbd3de599827e4b9adc75ce2b5 100644 --- a/examples/javascript/Makefile +++ b/examples/javascript/Makefile @@ -21,8 +21,10 @@ BOARD_BLACKLIST := arduino-duemilanove arduino-mega2560 arduino-uno chronos \ # development process: DEVELHELP ?= 1 +ifneq ($(BOARD),native) # Set stack size to something (conservatively) enormous CFLAGS += -DTHREAD_STACKSIZE_MAIN=9092 +endif # Add the package for Jerryscript USEPKG += jerryscript diff --git a/pkg/jerryscript/Makefile b/pkg/jerryscript/Makefile index 506449057022115fd224ef78be3ae5c6c2886926..b9c4095215a6846b44d09300dbaf4406a06e795d 100644 --- a/pkg/jerryscript/Makefile +++ b/pkg/jerryscript/Makefile @@ -1,12 +1,17 @@ PKG_NAME=jerryscript PKG_URL=https://github.com/jerryscript-project/jerryscript.git -PKG_VERSION=e62b5b601bc1caa3e4d8172824988536ed6138f3 +PKG_VERSION=bd574956e3702bc5b0512ad835b1df896cf00626 PKG_LICENSE=Apache-2.0 .PHONY: all CFLAGS += -Wno-implicit-fallthrough +# disable warnings when compiling with LLVM for board native +ifeq ($(TOOLCHAIN)_$(BOARD),llvm_native) +export CFLAGS += -Wno-macro-redefined -Wno-gnu-folding-constant +endif + all: git-download @cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR) diff --git a/pkg/jerryscript/Makefile.jerryscript b/pkg/jerryscript/Makefile.jerryscript index f760fd159a7f88bbbb26aceb8e3c96991b96b4b0..2f11a8c48adcc241332cff69c2218d67bf61a73b 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 \ + -DENABLE_ALL_IN_ONE=OFF \ -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_CMDLINE=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)