YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target: zephyr: Make "OUTPUT" varible match Zephyr's "O" variable. (#1404)

Browse Source 
JerryScript Zephyr port overrides standard Zephyr output location. But
components integrating Zephyr port may want to override it again. Make
sure that arbitrary overrides are possible, and just set the default
value to Zephyr port's custom preference.

JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org
This commit is contained in:
Paul Sokolovsky
2016-10-21 12:52:19 +03:00
committed by Zoltan Herczeg
parent b9f540fc90
commit fdf9e71caa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/zephyr/Makefile.zephyr
+8 -8
View File
@@ -46,8 +46,8 @@ $(error Missing Zephyr base, did you source zephyr-env.sh? )
endif endif
INTERM = build/$(BOARD)/obj-$(BOARD) INTERM = build/$(BOARD)/obj-$(BOARD)
OUTPUT = build/$(BOARD) OUTPUT = build/$(BOARD)/zephyr
DOTCONFIG = $(OUTPUT)/zephyr/.config DOTCONFIG = $(OUTPUT)/.config
include $(DOTCONFIG) include $(DOTCONFIG)
override ARCH = $(subst ",,$(CONFIG_ARCH)) override ARCH = $(subst ",,$(CONFIG_ARCH))
@@ -112,18 +112,18 @@ EXT_CFLAGS += -nostdlib
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
ZEPHYR_LIBC_INC = $(subst -I,,$(TOOLCHAIN_CFLAGS)) ZEPHYR_LIBC_INC = $(subst -I,,$(TOOLCHAIN_CFLAGS))
LIB_INCLUDE_DIR += -L $(CURDIR)/$(OUTPUT) LIB_INCLUDE_DIR += -L $(CURDIR)/$(OUTPUT)/..
EXT_CFLAGS += -Wno-error=conversion EXT_CFLAGS += -Wno-error=conversion
EXT_CFLAGS += $(LIB_INCLUDE_DIR) EXT_CFLAGS += $(LIB_INCLUDE_DIR)
EXT_CFLAGS += $(subst -I,-isystem,$(TOOLCHAIN_CFLAGS)) EXT_CFLAGS += $(subst -I,-isystem,$(TOOLCHAIN_CFLAGS))
EXTERNAL_LIB = $(INTERM)/lib/libjerry-core.a EXTERNAL_LIB = $(INTERM)/lib/libjerry-core.a
ZEPHYR_BIN = $(OUTPUT)/zephyr/zephyr.strip ZEPHYR_BIN = $(OUTPUT)/zephyr.strip
LIBS = jerry-core LIBS = jerry-core
BUILD_CONFIG = O="$(OUTPUT)/zephyr" V=$(V) USER_LIBS="$(LIBS)" USER_LIB_INCLUDE_DIR="-L $(CURDIR)/$(INTERM)/lib" TARGET_ZEPHYR=$(TARGET_ZEPHYR) BUILD_CONFIG = O="$(OUTPUT)" V=$(V) USER_LIBS="$(LIBS)" USER_LIB_INCLUDE_DIR="-L $(CURDIR)/$(INTERM)/lib" TARGET_ZEPHYR=$(TARGET_ZEPHYR)
.PHONY: all .PHONY: all
all: jerry zephyr all: jerry zephyr
@@ -164,8 +164,8 @@ ifdef V
endif endif
make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG) make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG)
@echo "Finished" @echo "Finished"
@file $(OUTPUT)/zephyr/zephyr.strip @file $(OUTPUT)/zephyr.strip
@size $(OUTPUT)/zephyr/zephyr.strip @size $(OUTPUT)/zephyr.strip
jerry: $(EXTERNAL_LIB) jerry: $(EXTERNAL_LIB)
@touch $(EXTERNAL_LIB) @touch $(EXTERNAL_LIB)
@@ -176,7 +176,7 @@ zephyr: $(EXTERNAL_LIB) $(ZEPHYR_BIN)
qemu: $(EXTERNAL_LIB) $(ZEPHYR_BIN) qemu: $(EXTERNAL_LIB) $(ZEPHYR_BIN)
make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG) qemu make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG) qemu
flash: $(EXTERNAL_LIB) $(OUTPUT)/zephyr/zephyr.strip flash: $(EXTERNAL_LIB) $(OUTPUT)/zephyr.strip
make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG) flash make -f $(TARGET_ZEPHYR)/Makefile $(BUILD_CONFIG) flash
debugserver: debugserver: