makebootable: Fix various build problems.

- Add jamfile for a build variant of libuuid.
- Adjust the build version of makebootable to link to that instead, as it would
  otherwise link in the target platform's version of libuuid_kernel, which
  wasn't necessarily compatible with the build platform's objects (i.e. when
  building a 32-bit Haiku image on a 64-bit host OS), and would consequently
  fail.
This commit is contained in:
Rene Gollent 2015-10-08 18:53:56 -04:00
parent 832f090ea8
commit c5271e6b51
3 changed files with 21 additions and 1 deletions

View File

@ -7,6 +7,7 @@ SubInclude HAIKU_TOP src build libpackage ;
SubInclude HAIKU_TOP src build libroot ;
SubInclude HAIKU_TOP src build libshared ;
SubInclude HAIKU_TOP src build libsolv ;
SubInclude HAIKU_TOP src build libuuid ;
if $(HOST_PLATFORM) = darwin {
SubInclude HAIKU_TOP src build libgnuregex ;

19
src/build/libuuid/Jamfile Normal file
View File

@ -0,0 +1,19 @@
SubDir HAIKU_TOP src build libuuid ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs uuid ] ;
SubDirCcFlags [ FDefines _KERNEL_MODE ] ;
MakeLocate libuuid_build.a : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ;
BuildPlatformStaticLibrary libuuid_build.a :
clear.c
compare.c
copy.c
gen_uuid.c
isnull.c
pack.c
parse.c
unpack.c
unparse.c
uuid_time.c
;

View File

@ -18,7 +18,7 @@ if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd || $(HOST_PLATFORM) =
hostPlatformSources = PartitionMap.cpp PartitionMapParser.cpp
crc32.cpp Header.cpp utility.cpp ;
hostPlatformLibs = libuuid_kernel.a ;
hostPlatformLibs = libuuid_build.a ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel
partitioning_systems intel ] ;