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

pkg/jerryscript: namespace BUILD_DIR variable

Browse Source 
BUILD_DIR was introduced but the variable was already used by
`pkg/jerryscript` so there is a name collision.
Namespace it to prevent issues.
This commit is contained in:
Gaëtan Harter 2019-01-16 17:47:12 +01:00
parent 61452669b9
commit 6a170583d6
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
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
@ -27,7 +27,7 @@ endif
all: libjerry
libjerry:
cmake -B$(BUILD_DIR) -H./ \
cmake -B$(JERRYSCRIPT_BUILD_DIR) -H./ \
-DCMAKE_SYSTEM_NAME=RIOT \
-DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
-DCMAKE_C_COMPILER=$(CC) \
@ -42,7 +42,7 @@ libjerry:
-DEXTERNAL_COMPILE_FLAGS="$(INCLUDES) $(EXT_CFLAGS)" \
-DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
"$(MAKE)" -C $(BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal
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-port-default-minimal.a $(BINDIR)/jerryport-minimal.a
"$(MAKE)" -C $(JERRYSCRIPT_BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal
cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
cp $(JERRYSCRIPT_BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a