hrev52605 adds 1 changeset to branch 'master'
old head: 887990594dba058b0849c0f2940bd721e8b6507d
new head: 349326db275da7f7f507540ccecb2780ac655fe9
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=349326db275d+%5E887990594dba
----------------------------------------------------------------------------
349326db275d: haiku_loader.hpkg: Add each compiled boot target
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52605
Commit: 349326db275da7f7f507540ccecb2780ac655fe9
URL: https://git.haiku-os.org/haiku/commit/?id=349326db275d
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Nov 28 18:31:15 2018 UTC
----------------------------------------------------------------------------
1 file changed, 7 insertions(+), 4 deletions(-)
build/jam/packages/HaikuLoader | 11 +++++++----
----------------------------------------------------------------------------
diff --git a/build/jam/packages/HaikuLoader b/build/jam/packages/HaikuLoader
index 5f048b0a80..4a35c9a59b 100644
--- a/build/jam/packages/HaikuLoader
+++ b/build/jam/packages/HaikuLoader
@@ -1,10 +1,13 @@
local haikuLoaderPackage = haiku_loader.hpkg ;
HaikuPackage $(haikuLoaderPackage) ;
-
-# boot loader
-AddFilesToPackage : haiku_loader.$(HAIKU_KERNEL_PLATFORM) ;
-
+# 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) ;
+}
# Force no compression, so the stage one loader can directly execute the boot
# loader.
