Build only the required part of zlib with correct options instead of reusing the userland version. This fixes some weird m68k issue, and still works on x86.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30482 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -37,7 +37,8 @@ KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) :
|
|||||||
boot_tarfs.a
|
boot_tarfs.a
|
||||||
boot_fatfs.a
|
boot_fatfs.a
|
||||||
|
|
||||||
libz.a
|
# needed by tarfs
|
||||||
|
boot_zlib.a
|
||||||
|
|
||||||
# libroot functions needed by the stage2 boot loader (compiled for the
|
# libroot functions needed by the stage2 boot loader (compiled for the
|
||||||
# kernel)
|
# kernel)
|
||||||
|
|||||||
@@ -13,8 +13,19 @@ SubDirC++Flags -fno-rtti $(defines) ;
|
|||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs zlib ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs zlib ] ;
|
||||||
|
|
||||||
KernelStaticLibrary boot_tarfs :
|
|
||||||
tarfs.cpp
|
KernelStaticLibrary boot_zlib :
|
||||||
inflate.c
|
inflate.c
|
||||||
|
inffast.c
|
||||||
|
inftrees.c
|
||||||
|
adler32.c
|
||||||
|
crc32.c
|
||||||
|
zutil.c
|
||||||
|
: -fno-pic
|
||||||
|
;
|
||||||
|
|
||||||
|
|
||||||
|
KernelStaticLibrary boot_tarfs :
|
||||||
|
tarfs.cpp
|
||||||
: -fno-pic
|
: -fno-pic
|
||||||
;
|
;
|
||||||
|
|||||||
Reference in New Issue
Block a user