From 92bb7e91ed4e4538a82190d313bb980262cc7057 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 29 Nov 2018 20:20:52 +0100 Subject: [PATCH] Revert "haiku_loader.hpkg: Add each compiled boot target" This reverts commit 349326db275da7f7f507540ccecb2780ac655fe9. Makes the system unbootable on my gcc2 BIOS machine. --- build/jam/packages/HaikuLoader | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/jam/packages/HaikuLoader b/build/jam/packages/HaikuLoader index 4a35c9a59b..5f048b0a80 100644 --- a/build/jam/packages/HaikuLoader +++ b/build/jam/packages/HaikuLoader @@ -1,13 +1,10 @@ local haikuLoaderPackage = haiku_loader.hpkg ; HaikuPackage $(haikuLoaderPackage) ; -# Add compiled boot loaders for architecture -# NOTE: bios_ia32 *MUST* be first on x86 in the hpkg for the MBR loader. -# It currently is based on name (b before e) -local bootTarget ; -for bootTarget in $(HAIKU_BOOT_TARGETS) { - AddFilesToPackage : haiku_loader.$(bootTarget) ; -} + +# boot loader +AddFilesToPackage : haiku_loader.$(HAIKU_KERNEL_PLATFORM) ; + # Force no compression, so the stage one loader can directly execute the boot # loader.