From 59bba8b9ecb8e9276bc1f6e71f839b1fe5a3a464 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 17 Oct 2018 21:21:47 -0500 Subject: [PATCH] build: Make EFI opt-out vs opt-in Change-Id: I94a5692b2e39e45ff843182f43fa757a0549583c --- build/jam/images/AnybootImage | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/jam/images/AnybootImage b/build/jam/images/AnybootImage index c7a4cf753b..ebb3c4aef6 100644 --- a/build/jam/images/AnybootImage +++ b/build/jam/images/AnybootImage @@ -41,18 +41,17 @@ BuildMBR $(baseMBR) : $(mbrSource) ; MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ; MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ; -if $(HAIKU_ANYBOOT_UEFI) = 1 { - Echo "Anyboot is MBR/UEFI hybrid" ; +if $(HAIKU_ANYBOOT_LEGACY) = 1 { + Echo "HAIKU_ANYBOOT_LEGACY defined so anyboot is MBR only" ; + BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE) + : $(HAIKU_IMAGE_NAME) ; +} else { local efiLoader = haiku_loader.efi ; local efiPartition = esp.image ; MakeLocate $(efiPartition) ; BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ; BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR) : $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_IMAGE_NAME) ; -} else { - Echo "Anyboot is MBR only" ; - BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE) - : $(HAIKU_IMAGE_NAME) ; } # TODO: this one seems to cause the build to fail each other run (caching?)