From ff6382031e0bc9d2a2fac59772c87f96c9cde519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 29 Apr 2009 01:52:01 +0000 Subject: [PATCH] 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 --- src/system/boot/Jamfile | 3 ++- src/system/boot/loader/file_systems/tarfs/Jamfile | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index 3fa507c463..33551f77b6 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -37,7 +37,8 @@ KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) : boot_tarfs.a boot_fatfs.a - libz.a + # needed by tarfs + boot_zlib.a # libroot functions needed by the stage2 boot loader (compiled for the # kernel) diff --git a/src/system/boot/loader/file_systems/tarfs/Jamfile b/src/system/boot/loader/file_systems/tarfs/Jamfile index 23c8b0c036..0b7008aa77 100644 --- a/src/system/boot/loader/file_systems/tarfs/Jamfile +++ b/src/system/boot/loader/file_systems/tarfs/Jamfile @@ -13,8 +13,19 @@ SubDirC++Flags -fno-rtti $(defines) ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs zlib ] ; -KernelStaticLibrary boot_tarfs : - tarfs.cpp + +KernelStaticLibrary boot_zlib : inflate.c + inffast.c + inftrees.c + adler32.c + crc32.c + zutil.c + : -fno-pic + ; + + +KernelStaticLibrary boot_tarfs : + tarfs.cpp : -fno-pic ;