From fa38d533747322cb444d949e3d5d8f3c5e8b5211 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Mon, 25 Sep 2006 15:51:02 +0000 Subject: [PATCH] make boot loader platform dependant git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18924 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/Jamfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index 3f487b40cf..9a5805b3e4 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -29,7 +29,7 @@ if $(TARGET_ARCH) = x86 { platformObjects += cpuid.o ; } -KernelLd boot_loader : +KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) : boot_platform_$(TARGET_BOOT_PLATFORM).o boot_arch_$(TARGET_ARCH).o boot_loader.a @@ -50,7 +50,7 @@ KernelLd boot_loader : # platform specific objects $(platformObjects) - : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader.ld + : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader_$(TARGET_BOOT_PLATFORM).ld : -Bstatic ; @@ -67,7 +67,7 @@ actions BuildZbeos { $(TARGET_OBJCOPY) -O binary $(2) $(1) } -BuildZbeos zbeos : boot_loader ; +BuildZbeos zbeos : boot_loader_$(TARGET_BOOT_PLATFORM) ; SubInclude HAIKU_TOP src system boot arch $(TARGET_ARCH) ; SubInclude HAIKU_TOP src system boot loader ;