1From 80f11fcb46f6b52e13501cb323ca1a849c3f6e88 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 18 Jan 2022 11:53:41 +0100
4Subject: [PATCH] src/Makefile: build util.c separately for makeguids
5
6util.c needs to be built twice when cross-compiling:
7for the build machine to be able to link with
8makeguids which then runs during the same build,
9and then for the actual target.
10
11Upstream-Status: Submitted [https://github.com/rhboot/efivar/pull/203]
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14 src/Makefile | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17diff --git a/src/Makefile b/src/Makefile
18index 0e423c4..b10051b 100644
19--- a/src/Makefile
20+++ b/src/Makefile
21@@ -28,10 +28,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFIVAR_SOURCES)))
22 EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c
23 EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES)))
24 GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c
25-MAKEGUIDS_SOURCES = makeguids.c util.c
26+MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c
27 MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES)))
28 MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds
29
30+util-makeguids.c :
31+	cp util.c util-makeguids.c
32+
33 ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \
34 	    $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \
35 	    $(sort $(wildcard include/efivar/*.h))
36--
372.20.1
38
39