RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #10789 from cladmi/pr/build_dir/fix_jerryscript

Browse Source 
pkg/jerryscript: namespace BUILD_DIR variable
This commit is contained in:
Martine Lenders 2019-01-16 18:57:42 +01:00 committed by GitHub
commit d4b92e931e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/jerryscript/Makefile.jerryscript
View File

@ -1,4 +1,4 @@
BUILD_DIR ?= $(BINDIR)/jerryscript JERRYSCRIPT_BUILD_DIR ?= $(BINDIR)/jerryscript
JERRYHEAP ?= 16 JERRYHEAP ?= 16
@ -27,7 +27,7 @@ endif
all: libjerry all: libjerry
libjerry: libjerry:
cmake -B$(BUILD_DIR) -H./ \ cmake -B$(JERRYSCRIPT_BUILD_DIR) -H./ \
-DCMAKE_SYSTEM_NAME=RIOT \ -DCMAKE_SYSTEM_NAME=RIOT \
-DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \ -DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
-DCMAKE_C_COMPILER=$(CC) \ -DCMAKE_C_COMPILER=$(CC) \
@ -42,7 +42,7 @@ libjerry:
-DEXTERNAL_COMPILE_FLAGS="$(INCLUDES) $(EXT_CFLAGS)" \ -DEXTERNAL_COMPILE_FLAGS="$(INCLUDES) $(EXT_CFLAGS)" \
-DMEM_HEAP_SIZE_KB=$(JERRYHEAP) -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
"$(MAKE)" -C $(BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal "$(MAKE)" -C $(JERRYSCRIPT_BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal
cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a