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

Exchanged -no-fpic with -fno-pic - AFAICT these should be the same, but

Browse Source 
GCC/ppc only understands the latter (more correct) version.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11578 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-03-05 14:11:02 +00:00
parent 7873a9806c
commit 979afc6fa4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+8 -7
View File
@@ -1,6 +1,7 @@
# Haiku main build rules
# Vanilla Jam compatibility # Vanilla Jam compatibility
if ! $(INVOCATION_SUBDIR_SET) { if ! $(INVOCATION_SUBDIR_SET) {
rule FIsPrefix rule FIsPrefix
{ {
# FIsPrefix <a> : <b> ; # FIsPrefix <a> : <b> ;
@@ -832,8 +833,8 @@ rule R5KernelAddon
local sources = $(3) ; local sources = $(3) ;
Addon $(1) : $(2) : $(3) ; Addon $(1) : $(2) : $(3) ;
ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -no-fpic ; ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -fno-pic ;
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic -fno-exceptions ; ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -fno-pic -fno-exceptions ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ; LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
LinkSharedOSLibs $(1) : $(4) /boot/develop/lib/x86/_KERNEL_ ; LinkSharedOSLibs $(1) : $(4) /boot/develop/lib/x86/_KERNEL_ ;
} }
@@ -924,8 +925,8 @@ rule R5KernelStaticLibrary
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(sources) ; MakeLocateObjects $(sources) ;
Library $(lib) : $(sources) ; Library $(lib) : $(sources) ;
ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -no-fpic ; ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -fno-pic ;
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic -fno-exceptions ; ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -fno-pic -fno-exceptions ;
} }
rule MergeObjectFromObjects rule MergeObjectFromObjects
@@ -1858,8 +1859,8 @@ rule KernelAddon
SetupObjectsDir ; SetupObjectsDir ;
Addon $(1) : $(2) : $(sources) ; Addon $(1) : $(2) : $(sources) ;
ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -no-fpic ; ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -fno-pic ;
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic -fno-exceptions ; ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -fno-pic -fno-exceptions ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ; LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
LinkSharedOSLibs $(1) : $(4) <nogrist>kernel.so ; LinkSharedOSLibs $(1) : $(4) <nogrist>kernel.so ;
SetupKernel $(sources) ; SetupKernel $(sources) ;