Commit 509d4205 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Andrei Vagin

Makefiles: introduce/use COMPEL_BIN

We call compel-host binary from a number of places, so
let's add COMPEL_BIN variable and use it.

travis-ci: success for More polishing for compel cli
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 545bac9b
COMPEL_BIN := $(SRC_DIR)/compel/compel-host
export COMPEL_BIN
COMPEL_VERSION_HEADER := compel/include/version.h COMPEL_VERSION_HEADER := compel/include/version.h
$(COMPEL_VERSION_HEADER): $(SRC_DIR)/Makefile.versions $(COMPEL_VERSION_HEADER): $(SRC_DIR)/Makefile.versions
......
...@@ -36,7 +36,7 @@ ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ...@@ -36,7 +36,7 @@ ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),) ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
CFLAGS += $(shell $(SRC_DIR)/compel/compel-host cflags) CFLAGS += $(shell $(COMPEL_BIN) cflags)
endif endif
ifeq ($(SRCARCH),arm) ifeq ($(SRCARCH),arm)
...@@ -63,7 +63,7 @@ $(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/pie.lib.a $(compel_lds) ...@@ -63,7 +63,7 @@ $(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/pie.lib.a $(compel_lds)
$(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel-host-bin $(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel-host-bin
$(call msg-gen, $@) $(call msg-gen, $@)
$(Q) $(SRC_DIR)/compel/compel-host hgen -f $< \ $(Q) $(COMPEL_BIN) hgen -f $< \
-l 4 \ -l 4 \
-p $(call target-name,$@) \ -p $(call target-name,$@) \
-o $@ $(piegen_stdout) -o $@ $(piegen_stdout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment