Added the ability to link against static libraries for both, the R5KernelAddon

and the KernelAddon rule.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7798 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-06-07 13:55:34 +00:00
parent bc9c604133
commit 600203b105

View File

@ -740,7 +740,7 @@ rule Addon
rule R5KernelAddon
{
# R5KernelAddon <name> : <relpath> : <sources> ;
# R5KernelAddon <name> : <relpath> : <sources> : <static-libraries> ;
local sources = $(3) ;
@ -749,7 +749,7 @@ rule R5KernelAddon
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic
-fno-exceptions -fno-rtti ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
LinkSharedOSLibs $(1) : /boot/develop/lib/x86/_KERNEL_ ;
LinkSharedOSLibs $(1) : $(4) /boot/develop/lib/x86/_KERNEL_ ;
}
rule Translator
@ -1709,7 +1709,7 @@ actions KernelLd
rule KernelAddon
{
# KernelAddon <name> : <relpath> : <sources> ;
# KernelAddon <name> : <relpath> : <sources> : <static-libraries> ;
local sources = $(3) ;
@ -1719,7 +1719,7 @@ rule KernelAddon
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic
-fno-exceptions -fno-rtti ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
LinkSharedOSLibs $(1) : $(OBOS_TOP)/objects/$(OBOS_ARCH).$(OBOS_VERSION)/kernel/kernel.so ;
LinkSharedOSLibs $(1) : $(4) $(OBOS_TOP)/objects/$(OBOS_ARCH).$(OBOS_VERSION)/kernel/kernel.so ;
# ToDo this has to be changed!
}