From ffe8b20cda9cb27883433a5ba7805f26f403fe23 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 3 Feb 2010 20:37:23 +0000 Subject: [PATCH] Clear HAIKU_SHARED_LIBSTDC++ and HAIKU_SHARED_LIBSUPC++ when the compiler doesn't know them. Not sure why that was commented out -- only this way the build system knows that the libs aren't available. Fixes the non-Haiku build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35397 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- configure | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 188fc1369f..a05d07469f 100755 --- a/configure +++ b/configure @@ -180,7 +180,6 @@ standard_gcc_settings() $headers/$d" done - # when not building the crosscompiler, to use cpp headers from # tree first, but fallback to local C++ system headers (like ) # if [ "$buildCrossTools" = "" ]; then @@ -190,17 +189,15 @@ standard_gcc_settings() if [ $HAIKU_STATIC_LIBSTDCXX = libstdc++.a ]; then HAIKU_STATIC_LIBSTDCXX= fi - # we build libstdc++.so ourselves, so we can leave it as is - # if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then - # HAIKU_SHARED_LIBSTDCXX= - # fi + if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then + HAIKU_SHARED_LIBSTDCXX= + fi if [ $HAIKU_STATIC_LIBSUPCXX = libsupc++.a ]; then HAIKU_STATIC_LIBSUPCXX= fi - # we build libsupc++.so ourselves, so we can leave it as is - # if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then - # HAIKU_SHARED_LIBSUPCXX= - # fi + if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then + HAIKU_SHARED_LIBSUPCXX= + fi ;; 2.9*) # check for correct (most up-to-date) legacy compiler and complain