riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9824 from cladmi/pr/make/jerryscript/clean

Browse Source 
pkg/jerryscript: build into '$(BINDIR)' and cleanups
This commit is contained in:
Alexandre Abadie 2018-12-19 16:25:11 +01:00 committed by GitHub
commit 8e4b6ed15b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/jerryscript/Makefile
View File

@ -9,11 +9,10 @@ CFLAGS += -Wno-implicit-fallthrough
# disable warnings when compiling with LLVM for board native # disable warnings when compiling with LLVM for board native
ifeq ($(TOOLCHAIN)_$(BOARD),llvm_native) ifeq ($(TOOLCHAIN)_$(BOARD),llvm_native)
export CFLAGS += -Wno-macro-redefined -Wno-gnu-folding-constant CFLAGS += -Wno-macro-redefined -Wno-gnu-folding-constant
endif endif
all: git-download all: git-download
@cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.jerryscript all
"$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

9
pkg/jerryscript/Makefile.jerryscript
View File

@ -1,4 +1,4 @@
BUILD_DIR ?= $(CURDIR)/riot BUILD_DIR ?= $(BINDIR)/jerryscript
JERRYHEAP ?= 16 JERRYHEAP ?= 16
@ -8,12 +8,11 @@ ifeq ($(TOOLCHAIN)_$(BOARD),llvm_native)
EXT_CFLAGS :=-D__TARGET_RIOT -Wno-conversion EXT_CFLAGS :=-D__TARGET_RIOT -Wno-conversion
endif endif
.PHONY: libjerry riot-jerry flash clean .PHONY: all libjerry
# all: libjerry riot-jerry all: libjerry
libjerry: libjerry:
mkdir -p $(BUILD_DIR)
cmake -B$(BUILD_DIR) -H./ \ cmake -B$(BUILD_DIR) -H./ \
-DCMAKE_SYSTEM_NAME=RIOT \ -DCMAKE_SYSTEM_NAME=RIOT \
-DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \ -DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
@ -33,5 +32,3 @@ libjerry:
cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a
include $(RIOTBASE)/Makefile.base