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

KernelAddon and KernelStaticLibrary don't include kernel, kernel arch, boot platform headers anymore.

Browse Source 
Fixed the build of most of targets using these rules. Though the build can be still broken, feel free to fix.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18521 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-08-17 12:18:11 +00:00
parent 83333816a2
commit 44d5675324
28 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/KernelRules
+6 -4
View File
@@ -1,7 +1,7 @@
rule SetupKernel
{
# Usage SetupKernel <sources_or_objects> : <extra_cc_flags>;
# Usage SetupKernel <sources_or_objects> : <extra_cc_flags> : <include_private_headers> ;
#
# <sources_or_objects> - Ideally sources, otherwise HDRSEARCH can not be
# set for the sources and the sources some header
@@ -11,7 +11,9 @@ rule SetupKernel
local objects = $(sources:S=$(SUFOBJ)) ;
# add private kernel headers
SourceSysHdrs $(sources) : $(TARGET_PRIVATE_KERNEL_HEADERS) ;
if $(3) != false {
SourceSysHdrs $(sources) : $(TARGET_PRIVATE_KERNEL_HEADERS) ;
}
local object ;
for object in $(objects) {
@@ -103,7 +105,7 @@ rule KernelAddon
Depends $(target) : $(beginGlue) $(endGlue) ;
# compile and link
SetupKernel $(sources) : $(TARGET_KERNEL_PIC_FLAGS) ;
SetupKernel $(sources) : $(TARGET_KERNEL_PIC_FLAGS) : false ;
local linkFlags = -nostdlib -Xlinker -soname=\"$(target)\" ;
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
Main $(target) : $(sources) ;
@@ -132,7 +134,7 @@ rule KernelStaticLibrary
# This is designed to take a set of sources and libraries and create
# a file called lib<name>.a
SetupKernel $(2) : $(3) ;
SetupKernel $(2) : $(3) : false ;
Library $(1) : $(2) ;
}