chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am:efi_cflags compile with gcc v5
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5a17642f7b7c3bbf246f300297544b5f55a79017..a5e07cfa68ea27f81832eff178b0b85a74c2eb46 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2505,6
+2505,7
@@
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
# ------------------------------------------------------------------------------
shell-completion/zsh/_bootctl
# ------------------------------------------------------------------------------
+if HAVE_GNUEFI
efi_cppflags = \
$(EFI_CPPFLAGS) \
-I$(top_builddir) -include config.h \
efi_cppflags = \
$(EFI_CPPFLAGS) \
-I$(top_builddir) -include config.h \
@@
-2532,7
+2533,8
@@
if ARCH_X86_64
efi_cflags += \
-mno-red-zone \
-DEFI_FUNCTION_WRAPPER \
efi_cflags += \
-mno-red-zone \
-DEFI_FUNCTION_WRAPPER \
- -DGNU_EFI_USE_MS_ABI
+ -DGNU_EFI_USE_MS_ABI \
+ -std=gnu90
endif
efi_ldflags = \
endif
efi_ldflags = \
@@
-2625,6
+2627,7
@@
test-efi-disk.img: $(sd_boot) $(stub) test/test-efi-create-disk.sh
test-efi: test-efi-disk.img
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
endif
test-efi: test-efi-disk.img
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
endif
+endif
# ------------------------------------------------------------------------------
if HAVE_BLKID
# ------------------------------------------------------------------------------
if HAVE_BLKID