[haiku-commits] haiku: hrev47532 - build/scripts src/system/runtime_loader

From: js-haiku-commits@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 20 Jul 2014 20:32:59 +0200 (CEST)
hrev47532 adds 1 changeset to branch 'master'
old head: 979440852759bcae1c64ab3192885efbb991ddef
new head: e0650f25c3c86e40fdb02a05714b73560d2b2328
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e0650f2+%5E9794408

----------------------------------------------------------------------------

e0650f2: Build libsupc++-kernel without TLS

                                     [ Jonathan Schleifer <js@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47532
Commit:      e0650f25c3c86e40fdb02a05714b73560d2b2328
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e0650f2
Author:      Jonathan Schleifer <js@xxxxxxxxxxx>
Date:        Sun Jul 20 18:32:34 2014 UTC

----------------------------------------------------------------------------

2 files changed, 6 insertions(+), 1 deletion(-)
build/scripts/build_cross_tools_gcc4 | 5 +++++
src/system/runtime_loader/Jamfile    | 2 +-

----------------------------------------------------------------------------

diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index 20fdf38..1623595 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -252,8 +252,13 @@ if [ -n "$kernelCcFlags" ]; then
        [ -f "$haikuMachine/32/libstdc++-v3/config.h" ] \
                && sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef 
_GLIBCXX_HAS_GTHREADS' \
                "$haikuMachine/32/libstdc++-v3/config.h"
+       [ -f 
"$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/c++config.h" ] \
+               && sed -i '/.*_GLIBCXX_HAS_TLS.*/c\#undef _GLIBCXX_HAS_TLS' \
+               
"$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/c++config.h"
        sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \
                "$haikuMachine/libstdc++-v3/config.h"
+       sed -i '/.*_GLIBCXX_HAVE_TLS.*/c\#undef _GLIBCXX_HAVE_TLS' \
+               
"$haikuMachine/libstdc++-v3/include/$haikuMachine/bits/c++config.h"
        $MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" CFLAGS="-g -O2 
$kernelCcFlags" \
                CXXFLAGS="-g -O2 $kernelCcFlags" || {
                echo "Error: Building kernel libsupc++ failed." >&2
diff --git a/src/system/runtime_loader/Jamfile 
b/src/system/runtime_loader/Jamfile
index da25b1f..eee444b 100644
--- a/src/system/runtime_loader/Jamfile
+++ b/src/system/runtime_loader/Jamfile
@@ -93,7 +93,7 @@ Ld runtime_loader :
        [ FGristFiles $(sources:S=$(SUFOBJ)) ]
        libruntime_loader.a
        libruntime_loader_$(TARGET_ARCH).a
-       $(HAIKU_STATIC_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
+       $(HAIKU_KERNEL_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
        $(HAIKU_GCC_LIBGCC_$(TARGET_PACKAGING_ARCH))
        : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld
        : --no-undefined -shared -soname=runtime_loader
[haiku-commits] haiku: hrev47532 - build/scripts src/system/runtime_loader

Other related posts:
