[haiku-commits] haiku: hrev43467 - src/build/libbe build/jam
- From: fredrik.holmqvist@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 11 Dec 2011 00:46:29 +0100 (CET)
hrev43467 adds 1 changeset to branch 'master'
old head: 44c3f5c18843a98ba881efb7e0d71145db705b31
new head: 34b63b5b9daa0796faf1a53b3f9594bc025f2cc4
----------------------------------------------------------------------------
34b63b5: Remove libbe_build linking m from earlier commit and add -lm to
HOST_LINK_FLAGS on non BeOS compatible platforms.
(HOST_LIBROOT would need more work than just adding m so I went the easy
route.)
[ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43467
Commit: 34b63b5b9daa0796faf1a53b3f9594bc025f2cc4
URL: http://cgit.haiku-os.org/haiku/commit/?id=34b63b5
Author: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date: Sat Dec 10 23:40:38 2011 UTC
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 6 deletions(-)
build/jam/BuildSetup | 1 +
src/build/libbe/Jamfile | 7 +------
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 41e72a2..c1ce288 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -772,6 +772,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
# compatibility library
HOST_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
} else {
+ HOST_LINKFLAGS += -lm ;
HOST_LIBSTDC++ = stdc++ ;
HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ;
HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a
;
diff --git a/src/build/libbe/Jamfile b/src/build/libbe/Jamfile
index c24d812..68d2afb 100644
--- a/src/build/libbe/Jamfile
+++ b/src/build/libbe/Jamfile
@@ -5,11 +5,6 @@ USES_BE_API on libbe_build.so = true ;
# locate the library
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 :
# no sources here
:
@@ -18,7 +13,7 @@ BuildPlatformSharedLibrary libbe_build.so :
<libbe_build>storage_kit.o
<libbe_build>support_kit.o
- $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(osLibs)
+ $(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
;
SubInclude HAIKU_TOP src build libbe app ;
Other related posts:
- » [haiku-commits] haiku: hrev43467 - src/build/libbe build/jam - fredrik . holmqvist
