From 6cc6f047476161f341e5b6556f4bb7a31855c4b1 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Tue, 5 Sep 2017 21:41:39 +0000 Subject: [PATCH] build_cross_tools_gcc4: bring in sync with native compiler. * Previously, the cross-compiler would generate code that doesn't run on Haiku, particularly where TLS is concerned. It also ended up with a c++config.h header incompatible with the version in the native compiler. * Now possible to correctly cross-compile rust for Haiku. --- build/scripts/build_cross_tools_gcc4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index e1c7bd0ed0..cafdd3e071 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -256,8 +256,9 @@ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$gccSourceDir/configure" \ --prefix="$installDir" $buildHostSpec --target=$haikuMachine \ --disable-nls --disable-shared --with-system-zlib \ --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ - --with-sysroot="$sysrootDir" --disable-threads --disable-tls \ - --disable-libatomic \ + --enable-__cxa-atexit --enable-threads=posix \ + --with-default-libstdcxx-abi=gcc4-compatible \ + --with-sysroot="$sysrootDir" \ $gccConfigureArgs \ || exit 1