[PATCH] fixup! block: generate coroutine-wrapper code

Eric Blake posted 1 patch 5 years, 4 months ago
Failed in applying to current master (apply log)
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH] fixup! block: generate coroutine-wrapper code
Posted by Eric Blake 5 years, 4 months ago
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Fix Makefile usage for VPATH builds

Signed-off-by: Eric Blake <eblake@redhat.com>
---

This fixup lets me build locally with my VPATH build; it probably also
explains why patchew and other CLI tools (which use VPATH) were
failing.

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ec15b8ea8900..d194cf067ba7 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,9 @@ generated-files-y += .git-submodule-status

 COROUTINE_HEADERS = include/block/block.h block/coroutines.h
 block/block-gen.c: $(COROUTINE_HEADERS) $(SRC_PATH)/scripts/coroutine-wrapper.py
-	$(call quiet-command, cat $(COROUTINE_HEADERS) | $(SRC_PATH)/scripts/coroutine-wrapper.py > $@,"GEN","$(TARGET_DIR)$@")
+	$(call quiet-command, \
+	  cat $(addprefix $(SRC_PATH)/,$(COROUTINE_HEADERS)) | \
+	  $(SRC_PATH)/scripts/coroutine-wrapper.py > $@,"GEN","$(TARGET_DIR)$@")

 trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')

-- 
2.26.2