[haiku-commits] r35397 - haiku/trunk

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 3 Feb 2010 21:37:23 +0100 (CET)

Author: bonefish
Date: 2010-02-03 21:37:23 +0100 (Wed, 03 Feb 2010)
New Revision: 35397
Changeset: http://dev.haiku-os.org/changeset/35397/haiku

Modified:
   haiku/trunk/configure
Log:
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.


Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure       2010-02-03 20:19:53 UTC (rev 35396)
+++ haiku/trunk/configure       2010-02-03 20:37:23 UTC (rev 35397)
@@ -180,7 +180,6 @@
                                        $headers/$d"
                        done
 
-
                        # when not building the crosscompiler, to use cpp 
headers from
                        # tree first, but fallback to local C++ system headers 
(like <new>)
                        # if [ "$buildCrossTools" = "" ]; then
@@ -190,17 +189,15 @@
                        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


Other related posts:

  • » [haiku-commits] r35397 - haiku/trunk - ingo_weinhold