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

Remove libbe_build linking m from earlier commit and add -lm to HOST_LINK_FLAGS on non BeOS compatible platforms.

Browse Source 
(HOST_LIBROOT would need more work than just adding m so I went the easy route.)
This commit is contained in:
Fredrik Holmqvist
2011-12-11 00:45:44 +01:00
parent 44c3f5c188
commit 34b63b5b9d
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+1
View File
@@ -772,6 +772,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
# compatibility library # compatibility library
HOST_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ; HOST_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
} else { } else {
HOST_LINKFLAGS += -lm ;
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_function_remapper.a libroot_build.a ; HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a ;
src/build/libbe/Jamfile
+1 -6
View File
@@ -5,11 +5,6 @@ USES_BE_API on libbe_build.so = true ;
# locate the library # locate the library
MakeLocate libbe_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ; MakeLocate libbe_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ;
local osLibs ;
if ! $(HOST_PLATFORM) in $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) {
osLibs = m ;
}
BuildPlatformSharedLibrary libbe_build.so : BuildPlatformSharedLibrary libbe_build.so :
# no sources here # no sources here
: :
@@ -18,7 +13,7 @@ BuildPlatformSharedLibrary libbe_build.so :
<libbe_build>storage_kit.o <libbe_build>storage_kit.o
<libbe_build>support_kit.o <libbe_build>support_kit.o
$(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(osLibs) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
; ;
SubInclude HAIKU_TOP src build libbe app ; SubInclude HAIKU_TOP src build libbe app ;