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

Add BReferenceable to boot loader

Browse Source 
Also force include kernel_cpp.h, so it doesn't have to be included in
every file (still is included in most, though).
This commit is contained in:
Ingo Weinhold
2011-07-17 16:54:15 +02:00
parent b232be5a47
commit 3057223796
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/Jamfile
+13 -6
View File
@@ -10,7 +10,7 @@ UsePrivateHeaders [ FDirName kernel util ] ;
UsePrivateHeaders shared storage ; UsePrivateHeaders shared storage ;
{ {
local defines = DEFINES +=
_BOOT_MODE _BOOT_MODE
BOOT_ARCH=\\\"$(TARGET_ARCH)\\\" BOOT_ARCH=\\\"$(TARGET_ARCH)\\\"
KMESSAGE_CONTAINER_ONLY KMESSAGE_CONTAINER_ONLY
@@ -28,7 +28,7 @@ UsePrivateHeaders shared storage ;
switch $(TARGET_ARCH) { switch $(TARGET_ARCH) {
case "ppc" : case "ppc" :
{ {
defines += DEFINES +=
BOOT_SUPPORT_PARTITION_AMIGA BOOT_SUPPORT_PARTITION_AMIGA
BOOT_SUPPORT_PARTITION_APPLE BOOT_SUPPORT_PARTITION_APPLE
@@ -37,7 +37,7 @@ UsePrivateHeaders shared storage ;
} }
case "x86" : case "x86" :
{ {
defines += DEFINES +=
BOOT_SUPPORT_PARTITION_EFI BOOT_SUPPORT_PARTITION_EFI
#BOOT_SUPPORT_FILE_SYSTEM_FAT #BOOT_SUPPORT_FILE_SYSTEM_FAT
@@ -45,11 +45,13 @@ UsePrivateHeaders shared storage ;
} }
} }
defines = [ FDefines $(defines) ] ; local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel util
SubDirCcFlags $(defines) ; kernel_cpp.h ] ;
SubDirC++Flags $(defines) -fno-rtti ;
SubDirC++Flags -fno-rtti -include $(kernelC++Header) ;
} }
KernelStaticLibrary boot_loader : KernelStaticLibrary boot_loader :
elf.cpp elf.cpp
heap.cpp heap.cpp
@@ -75,6 +77,8 @@ KernelStaticLibrary boot_loader :
ring_buffer.cpp ring_buffer.cpp
safemode_settings.cpp safemode_settings.cpp
Referenceable.cpp
: -fno-pic : -fno-pic
; ;
@@ -120,6 +124,9 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
SEARCH on [ FGristFiles stage2_crt0.S ] SEARCH on [ FGristFiles stage2_crt0.S ]
= [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ] ;
SEARCH on [ FGristFiles Referenceable.cpp ]
= [ FDirName $(HAIKU_TOP) src kits support ] ;
SubInclude HAIKU_TOP src system boot loader file_systems ; SubInclude HAIKU_TOP src system boot loader file_systems ;
SubInclude HAIKU_TOP src system boot loader net ; SubInclude HAIKU_TOP src system boot loader net ;