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

Build libsupc++-kernel without TLS

Browse Source
This commit is contained in:
Jonathan Schleifer
2014-07-20 20:32:34 +02:00
parent 9794408527
commit e0650f25c3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools_gcc4
+5
View File
@@ -252,8 +252,13 @@ if [ -n "$kernelCcFlags" ]; then
[ -f "$haikuMachine/32/libstdc++-v3/config.h" ] \ [ -f "$haikuMachine/32/libstdc++-v3/config.h" ] \
&& sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \ && sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \
"$haikuMachine/32/libstdc++-v3/config.h" "$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' \ sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \
"$haikuMachine/libstdc++-v3/config.h" "$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" \ $MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" CFLAGS="-g -O2 $kernelCcFlags" \
CXXFLAGS="-g -O2 $kernelCcFlags" || { CXXFLAGS="-g -O2 $kernelCcFlags" || {
echo "Error: Building kernel libsupc++ failed." >&2 echo "Error: Building kernel libsupc++ failed." >&2
src/system/runtime_loader/Jamfile
+1 -1
View File
@@ -93,7 +93,7 @@ Ld runtime_loader :
[ FGristFiles $(sources:S=$(SUFOBJ)) ] [ FGristFiles $(sources:S=$(SUFOBJ)) ]
libruntime_loader.a libruntime_loader.a
libruntime_loader_$(TARGET_ARCH).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_GCC_LIBGCC_$(TARGET_PACKAGING_ARCH))
: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld
: --no-undefined -shared -soname=runtime_loader : --no-undefined -shared -soname=runtime_loader