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

Build fix part 2: active libroot_build.a again:

Browse Source 
* 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 (<build>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?
This commit is contained in:
Oliver Tappe
2011-11-25 22:04:51 +01:00
parent 8cdc273ad3
commit 692e9b11e4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+1 -1
View File
@@ -774,7 +774,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
} else { } else {
HOST_LIBSTDC++ = stdc++ ; HOST_LIBSTDC++ = stdc++ ;
HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ; 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 ; HOST_LIBBE = libbe_build.so ;
if $(HOST_PLATFORM) = cygwin { if $(HOST_PLATFORM) = cygwin {
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
src/build/libroot/Jamfile
+4 -5
View File
@@ -80,11 +80,10 @@ BuildPlatformSharedLibrary libroot_build.so :
$(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
; ;
# TODO: This doesn't work with the function remapping. BuildPlatformStaticLibrary libroot_build.a :
#BuildPlatformStaticLibrary libroot_build.a : :
# : [ FGristFiles $(librootSources:S=$(SUFOBJ)) ]
# [ FGristFiles $(librootSources:S=$(SUFOBJ)) ] ;
#;
USES_BE_API on [ FGristFiles function_remapper$(SUFOBJ) ] = true ; USES_BE_API on [ FGristFiles function_remapper$(SUFOBJ) ] = true ;