Skip to content

Commit

Permalink
pkg/jerryscript: namespace BUILD_DIR variable
Browse files Browse the repository at this point in the history
BUILD_DIR was introduced but the variable was already used by
`pkg/jerryscript` so there is a name collision.
Namespace it to prevent issues.
  • Loading branch information
cladmi committed Jan 16, 2019
1 parent 6145266 commit 6a17058
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkg/jerryscript/Makefile.jerryscript
@@ -1,4 +1,4 @@
BUILD_DIR ?= $(BINDIR)/jerryscript
JERRYSCRIPT_BUILD_DIR ?= $(BINDIR)/jerryscript

JERRYHEAP ?= 16

Expand Down Expand Up @@ -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) \
Expand All @@ -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

0 comments on commit 6a17058

Please sign in to comment.