From 692e9b11e41277d5d5f75e1ab282468f8e7d2cdd Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 25 Nov 2011 22:04:51 +0100 Subject: [PATCH] Build fix part 2: active libroot_build.a again: * uncomment the building of libroot_build.a again * add function remapper to HOST_STATIC_LIBROOT * drop TODO about the function remapper not working with the static libroot Ingo: please review - I think this should work, but I'm not so sure where HOST_STATIC_LIBROOT should be in the list of libraries of its only user (bfs_fuse): where it is now or right at the end? As it is now, the resulting binary still contains references to host-libc-implementations of close() & others, which are triggered by the other libs (like libfuse.so). If I put HOST_STATIC_LIBROOT right at the end, those references are gone, though. But which is correct? --- build/jam/BuildSetup | 2 +- src/build/libroot/Jamfile | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 7841673a61..41e72a2ad9 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -774,7 +774,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) { } else { HOST_LIBSTDC++ = stdc++ ; HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ; - HOST_STATIC_LIBROOT = libroot_build.a ; + HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a ; HOST_LIBBE = libbe_build.so ; if $(HOST_PLATFORM) = cygwin { HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile index 34f947ed00..e1ebd9d509 100644 --- a/src/build/libroot/Jamfile +++ b/src/build/libroot/Jamfile @@ -80,11 +80,10 @@ BuildPlatformSharedLibrary libroot_build.so : $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) ; -# TODO: This doesn't work with the function remapping. -#BuildPlatformStaticLibrary libroot_build.a : -# : -# [ FGristFiles $(librootSources:S=$(SUFOBJ)) ] -#; +BuildPlatformStaticLibrary libroot_build.a : + : + [ FGristFiles $(librootSources:S=$(SUFOBJ)) ] +; USES_BE_API on [ FGristFiles function_remapper$(SUFOBJ) ] = true ;