i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make boot loader platform dependant

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18924 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-09-25 15:51:02 +00:00
parent bf905142eb
commit fa38d53374
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/Jamfile
+3 -3
View File
@@ -29,7 +29,7 @@ if $(TARGET_ARCH) = x86 {
platformObjects += <src!system!kernel!arch!$(TARGET_ARCH)>cpuid.o ; platformObjects += <src!system!kernel!arch!$(TARGET_ARCH)>cpuid.o ;
} }
KernelLd boot_loader : KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) :
boot_platform_$(TARGET_BOOT_PLATFORM).o boot_platform_$(TARGET_BOOT_PLATFORM).o
boot_arch_$(TARGET_ARCH).o boot_arch_$(TARGET_ARCH).o
boot_loader.a boot_loader.a
@@ -50,7 +50,7 @@ KernelLd boot_loader :
# platform specific objects # platform specific objects
$(platformObjects) $(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 : -Bstatic
; ;
@@ -67,7 +67,7 @@ actions BuildZbeos {
$(TARGET_OBJCOPY) -O binary $(2) $(1) $(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 arch $(TARGET_ARCH) ;
SubInclude HAIKU_TOP src system boot loader ; SubInclude HAIKU_TOP src system boot loader ;