From 4cacc85bae46abd2ebe26d53dd3dc6263337ed20 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 23 Jan 2005 19:56:19 +0000
Subject: [PATCH] Prevent a linker error. It complains about multiple
 definitions of nothrow.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10985 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/core/util/Jamfile        | 2 +-
 src/kernel/core/util/kernel_cpp.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/kernel/core/util/Jamfile b/src/kernel/core/util/Jamfile
index 0dbbec5709..3cd5a963e2 100644
--- a/src/kernel/core/util/Jamfile
+++ b/src/kernel/core/util/Jamfile
@@ -7,5 +7,5 @@ KernelMergeObject kernel_util.o :
 	kernel_cpp.cpp
 	KMessage.cpp
 
-	: -fno-pic -Wno-unused -D_KERNEL_MODE
+	: -fno-pic -Wno-unused -D_KERNEL_MODE -DUSING_LIBGCC
 	;
diff --git a/src/kernel/core/util/kernel_cpp.cpp b/src/kernel/core/util/kernel_cpp.cpp
index 6d42bac915..bcd4fe292f 100644
--- a/src/kernel/core/util/kernel_cpp.cpp
+++ b/src/kernel/core/util/kernel_cpp.cpp
@@ -15,7 +15,10 @@
 // Always define the symbols needed when not linking against libgcc.a --
 // we simply override them.
 
+// ... it doesn't seem to work with this symbol at least.
+#ifndef USING_LIBGCC
 const nothrow_t std::nothrow = {};
+#endif
 
 #if __GNUC__ == 2