aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2014-02-22 12:00:11 -0500
committerGene Cumm <gene.cumm@gmail.com>2014-02-22 12:00:11 -0500
commitdd68a012cbf39d543d34ac6927cb4e4737e16445 (patch)
tree90d2b1659a1df7a6b780e46ac5aca8ea70385501 /mk
parent269a518780bd33f3c1085c402c30e225e5c48663 (diff)
downloadsyslinux-dd68a012cbf39d543d34ac6927cb4e4737e16445.tar.gz
syslinux-dd68a012cbf39d543d34ac6927cb4e4737e16445.tar.xz
syslinux-dd68a012cbf39d543d34ac6927cb4e4737e16445.zip
efi: fix up gnu-efi build
This eliminates the forking and pushes the build under the efi32/ and efi64/ object directories eliminating a build race and preventing the build from breaking as gnu-efi takes a few seconds to complete. Depends on gnu-efi commit 52d88dd Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/efi.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/efi.mk b/mk/efi.mk
index 5de3a844..3390cfcd 100644
--- a/mk/efi.mk
+++ b/mk/efi.mk
@@ -20,11 +20,6 @@ ifeq ($(ARCH),x86_64)
EFI_SUBARCH = $(ARCH)
endif
-output = $(shell $(topdir)/efi/check-gnu-efi.sh $(EFI_SUBARCH) $(objdir))
-ifneq ($(output),)
-$(error Failed to build gnu-efi for $(EFI_SUBARCH))
-endif
-
#LIBDIR=/usr/lib
FORMAT=efi-app-$(EFI_SUBARCH)
@@ -49,6 +44,12 @@ SFLAGS = $(GCCOPT) $(GCCWARN) $(ARCHOPT) \
-nostdinc -iwithprefix include \
-I$(com32)/libutil/include -I$(com32)/include -I$(com32)/include/sys $(GPLINCLUDE)
+LIBEFI = $(objdir)/lib/libefi.a
+
+$(LIBEFI):
+ @echo Building gnu-efi for $(EFI_SUBARCH)
+ $(topdir)/efi/check-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+
%.o: %.S # Cancel old rule
%.o: %.c