build: Make EFI opt-out vs opt-in

Change-Id: I94a5692b2e39e45ff843182f43fa757a0549583c
This commit is contained in:
Alexander von Gluck IV 2018-10-17 21:21:47 -05:00
parent 2ff03651b7
commit 59bba8b9ec

View File

@ -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?)