File 0006-use-libsupc-instead-of-hack-for-static-libstdc.diff of Package enemy-territory

From e580cfc2bf4b6fbe2b41977985c135a63cbcfc63 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Sat, 14 Aug 2010 12:46:50 +0200
Subject: [PATCH 6/7] use libsupc++ instead of hack for static libstdc++

---
 src/SConscript.core |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/SConscript.core b/src/SConscript.core
index 24bfd42..bd132b2 100644
--- a/src/SConscript.core
+++ b/src/SConscript.core
@@ -269,11 +269,9 @@ if ( g_os == 'Linux' ):
 		local_env.Append( CPPDEFINES = [ 'DEDICATED' ] )
 		local_env.Append( LIBS = [ 'm' ] )
 
-	if gcc3 == 0:
-		g_env.Append(LINKFLAGS=[ os.popen( g_env['CXX'] + ' -print-file-name=libstdc++.a' ).read().rstrip() ])
-	else:
-		local_env['ENV']['CC'] = g_env['CC']
-		local_env['LINK'] = 'unix/staticlinkcpp.sh'
+	local_env['ENV']['CC'] = g_env['CC']
+	local_env.Append( LIBS = [ 'supc++' ] )
+
 elif ( g_os == 'win32' ):
 	local_env.Append( LIBS = [ 'm', 'winmm', 'wsock32', 'gdi32', 'ole32', 'iphlpapi' ] )
 	if ( local_dedicated == 0 ):
-- 
1.6.4.2