From c89fc8752d05038ff640b5e738e8c1c8faea2bb8 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 14 Nov 2005 13:47:52 +0000
Subject: [PATCH] * More consequent handling of libsupc++. configure looks it
 up now and   provides it via BuildConfig. We link everything against it. *
 Temporarily pass --no-undefined to the linker. Should be in the   compiler
 specs, but isn't in the gcc 4 I built. * Define _BEOS_R5_COMPATIBLE_ macro
 when building with gcc 2. Can be   used in headers for instance.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14913 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/BuildSetup  | 20 +++++++++++++-------
 build/jam/KernelRules |  4 +---
 configure             | 14 +++++++++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index be949a964b..68b38b988f 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -160,10 +160,12 @@ for level in $(HAIKU_DEBUG_LEVELS[2-]) {
 	HAIKU_KERNEL_DEBUG_$(level)_C++FLAGS	= $(flags) ;
 }
 
-# gcc version dependent defines
-# if $(HAIKU_GCC_VERSION[1]) >= 3 {
-# 	HAIKU_DEFINES += __FUNCTION__=__func__ ;
-# }
+if $(HAIKU_GCC_VERSION[1]) >= 3 {
+	# TODO: Temporary work-around. Should be defined in the compiler specs
+	HAIKU_LINKFLAGS += -Xlinker --no-undefined ;
+} else {
+	HAIKU_DEFINES += _BEOS_R5_COMPATIBLE_ ;
+}
 
 # private kernel headers do be used when compiling kernel code
 HAIKU_PRIVATE_KERNEL_HEADERS =
@@ -185,10 +187,12 @@ if $(HAIKU_SHARED_LIBSTDC++) {
 }
 
 # the C++ support library
-if $(HAIKU_GCC_VERSION[1]) < 3 {
-	HAIKU_LIBSUPC++ = ;
+if $(HAIKU_SHARED_LIBSUPC++) {
+	HAIKU_LIBSUPC++ = $(HAIKU_SHARED_LIBSUPC++) ;
+} else if $(HAIKU_STATIC_LIBSUPC++) {
+	HAIKU_LIBSUPC++ = $(HAIKU_STATIC_LIBSUPC++) ;
 } else {
-	HAIKU_LIBSUPC++ = supc++ ;
+	HAIKU_LIBSTDC++ = ;
 }
 
 # library and executable glue code
@@ -203,6 +207,8 @@ HAIKU_LIBRARY_BEGIN_GLUE_CODE =
 	<src!system!glue>init_term_dyn.o
 ;
 HAIKU_LIBRARY_END_GLUE_CODE =
+	# TODO: For the time being always link against libsupc++.a.
+	$(HAIKU_STATIC_LIBSUPC++)
 	crtend.o
 	<src!system!glue!arch!$(HAIKU_ARCH)>crtn.o
 ;
diff --git a/build/jam/KernelRules b/build/jam/KernelRules
index 177c7c11ab..e879845ecd 100644
--- a/build/jam/KernelRules
+++ b/build/jam/KernelRules
@@ -42,9 +42,7 @@ rule KernelLd
 	if $(3) { LINKFLAGS on $(1) += --script=$(3) ; }
 
 	# Remove any preset LINKLIBS, but link against libgcc.a
-	LINKLIBS on $(1) = -l$(TARGET_LIBSUPC++) $(TARGET_GCC_LIBGCC) ;
-		# TODO: Linking against TARGET_LIBSUPC++ is OK, but doing it like
-		# this is not so nice.
+	LINKLIBS on $(1) = $(TARGET_STATIC_LIBSUPC++) $(TARGET_GCC_LIBGCC) ;
 
 	# TODO: Do we really want to invoke SetupKernel here? The objects should
 	# have been compiled with KernelObjects anyway, so we're doing that twice.
diff --git a/configure b/configure
index c4327728d5..8af2cceaea 100755
--- a/configure
+++ b/configure
@@ -80,11 +80,13 @@ standard_gcc_settings()
 	HAIKU_GCC_HEADERS_DIR=${gccdir}/include
 	HAIKU_GCC_LIBGCC_OBJECTS=`ar t ${HAIKU_GCC_LIBGCC}`
 
-	# for gcc 4 we use the libstdc++ that comes with the compiler
+	# for gcc 4 we use the libstdc++ and libsupc++ that come with the compiler
 	case $haikuGCCVersion in
 		4.*)
 			haikuStaticLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.a`
 			haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
+			haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
+			haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so`
 			local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
 			haikuCxxHeadersDir=$headers
 			for d in $haikuGCCMachine backward ext debug; do
@@ -97,6 +99,12 @@ standard_gcc_settings()
 			if [ $haikuSharedLibStdCxx = libstdc++.so ]; then
 				haikuSharedLibStdCxx=
 			fi
+			if [ $haikuStaticLibSupCxx = libsupc++.a ]; then
+				haikuStaticLibSupCxx=
+			fi
+			if [ $haikuSharedLibSupCxx = libsupc++.so ]; then
+				haikuSharedLibSupCxx=
+			fi
 		;;
 	esac
 }
@@ -150,6 +158,8 @@ platform=`uname`
 haikuGCCVersion=
 haikuStaticLibStdCxx=
 haikuSharedLibStdCxx=
+haikuStaticLibSupCxx=
+haikuSharedLibSupCxx=
 haikuCxxHeadersDir=
 hostGCCVersion=`cc -dumpversion`
 floppy=
@@ -261,6 +271,8 @@ HAIKU_GCC_LIBGCC		?= ${HAIKU_GCC_LIBGCC} ;
 
 HAIKU_STATIC_LIBSTDC++	?= ${haikuStaticLibStdCxx} ;
 HAIKU_SHARED_LIBSTDC++	?= ${haikuSharedLibStdCxx} ;
+HAIKU_STATIC_LIBSUPC++	?= ${haikuStaticLibSupCxx} ;
+HAIKU_SHARED_LIBSUPC++	?= ${haikuSharedLibSupCxx} ;
 HAIKU_C++_HEADERS_DIR	?= ${haikuCxxHeadersDir} ;
 
 HAIKU_BUILD_ATTRIBUTES_DIR	?= ${buildAttributesDir} ;