15a2072
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
15a2072
From: Will Thompson <wjt@endlessm.com>
15a2072
Date: Thu, 12 Jul 2018 19:00:42 +0100
15a2072
Subject: [PATCH] blscfg: fix compilation on !EFI and !EMU
15a2072
MIME-Version: 1.0
15a2072
Content-Type: text/plain; charset=UTF-8
15a2072
Content-Transfer-Encoding: 8bit
15a2072
15a2072
Neither GRUB_MACHINE_EFI nor GRUB_MACHINE_EMU are defined when compiling
15a2072
for (eg) i386-pc. In this case, #elif GRUB_MACHINE_EMU is an error:
15a2072
15a2072
  commands/blscfg.c: In function ‘grub_cmd_blscfg’:
15a2072
  commands/blscfg.c:835:7: error: "GRUB_MACHINE_EMU" is not defined [-Werror=undef]
15a2072
   #elif GRUB_MACHINE_EMU
15a2072
         ^~~~~~~~~~~~~~~~
15a2072
15a2072
Signed-off-by: Will Thompson <wjt@endlessm.com>
15a2072
---
15a2072
 grub-core/commands/blscfg.c | 2 +-
15a2072
 1 file changed, 1 insertion(+), 1 deletion(-)
15a2072
15a2072
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
15a2072
index 11a356de81a..53676576ba5 100644
15a2072
--- a/grub-core/commands/blscfg.c
15a2072
+++ b/grub-core/commands/blscfg.c
15a2072
@@ -843,7 +843,7 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt UNUSED,
15a2072
   info.platform = PLATFORM_EFI;
15a2072
   grub_dprintf ("blscfg", "scanning /EFI/\n");
15a2072
   r = fs->dir (dev, "/EFI/", find_entry, &info;;
15a2072
-#elif GRUB_MACHINE_EMU
15a2072
+#elif defined(GRUB_MACHINE_EMU)
15a2072
   info.platform = PLATFORM_EMU;
15a2072
   grub_dprintf ("blscfg", "scanning %s%s\n", GRUB_BOOT_DEVICE,
15a2072
 		GRUB_BLS_CONFIG_PATH);