diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
| commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
| tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/grp-boot | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/grp-boot')
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 4 | ||||
| -rw-r--r-- | src/grp-boot/systemd-boot/Makefile | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index d01e6ea7d3..2fcdc44799 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -49,7 +49,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_bootctl -endif - +endif # HAVE_BLKID +endif # ENABLE_EFI $(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile index afa32f02fd..074438908e 100644 --- a/src/grp-boot/systemd-boot/Makefile +++ b/src/grp-boot/systemd-boot/Makefile @@ -23,6 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +ifneq ($(ENABLE_EFI),) ifneq ($(HAVE_GNUEFI),) efi_cppflags = \ $(EFI_CPPFLAGS) \ @@ -54,13 +55,13 @@ efi_cflags += \ -mno-mmx \ -DEFI_FUNCTION_WRAPPER \ -DGNU_EFI_USE_MS_ABI -endif +endif # ARCH_X86_64 ifneq ($(ARCH_IA32),) efi_cflags += \ -mno-sse \ -mno-mmx -endif +endif # ARCH_IA32 efi_ldflags = \ $(EFI_LDFLAGS) \ @@ -79,9 +80,9 @@ efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa EFI_FORMAT = -O binary else EFI_FORMAT = --target=efi-app-$(EFI_ARCH) -endif -endif -endif +endif # ARCH_AARCH64 +endif # HAVE_GNUEFI +endif # ENABLE_EFI # ------------------------------------------------------------------------------ systemd_boot_headers = \ @@ -121,8 +122,8 @@ $(systemd_boot_solib): $(systemd_boot_objects) $(systemd_boot): $(systemd_boot_solib) $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ -endif -endif +endif # HAVE_GNUEFI +endif # ENABLE_EFI CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot) @@ -169,8 +170,8 @@ $(stub_solib): $(stub_objects) $(stub): $(stub_solib) $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ -endif -endif +endif # HAVE_GNUEFI +endif # ENABLE_EFI CLEANFILES += $(stub_objects) $(stub_solib) $(stub) |