diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-11 11:31:42 -0500 |
|---|---|---|
| committer | Javier Martinez Canillas <javier@dowhile0.org> | 2021-03-12 10:15:01 +0100 |
| commit | 3c00db33e53d0cab3b701c1569a79c64878f202d (patch) | |
| tree | bab2a787554343c65cfed516f65461375eb441a0 | |
| parent | ed6265c567f7e5aaa0d326e8a5fc21f3499f3ffc (diff) | |
| download | efi-boot-shim-3c00db33e53d0cab3b701c1569a79c64878f202d.tar.gz efi-boot-shim-3c00db33e53d0cab3b701c1569a79c64878f202d.zip | |
Fix include order
scan-build helpfully notes:
| In file included from shim.c:14:
| In file included from /home/pjones/devel/github.com/shim/sbat-aarch64/shim.h:183:
| /home/pjones/devel/github.com/shim/sbat-aarch64/include/hexdump.h:123:2: error: 'va_start' used in Win64 ABI function
| va_start(ap, at);
| ^
| /usr/lib/gcc/x86_64-redhat-linux/10/include/stdarg.h:47:23: note: expanded from macro 'va_start'
| #define va_start(v,l) __builtin_va_start(v,l)
| ^
This is because one of the patches for the builtin swizzling is missing
a correction for the include order. This patch fixes that order.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Make.defaults | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Make.defaults b/Make.defaults index 95c24914..47d8ffe3 100644 --- a/Make.defaults +++ b/Make.defaults @@ -97,11 +97,11 @@ DEFINES = -DDEFAULT_LOADER='L"$(DEFAULT_LOADER)"' \ -DDEFAULT_LOADER_CHAR='"$(DEFAULT_LOADER)"' INCLUDES = -nostdinc \ - -I$(shell $(CC) $(ARCH_CFLAGS) -print-file-name=include) \ -I$(TOPDIR)/Cryptlib -I$(TOPDIR)/Cryptlib/Include \ -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH_GNUEFI) -I$(EFI_INCLUDE)/protocol \ -I$(TOPDIR)/include -iquote $(TOPDIR) -iquote $(shell pwd) \ - -isystem $(TOPDIR)/include/system + -isystem $(TOPDIR)/include/system \ + -isystem $(shell $(CC) $(ARCH_CFLAGS) -print-file-name=include) override DEFAULT_FEATUREFLAGS = \ -std=gnu11 \ |