From 3432d1de7ae83a19dec2eb6bcfc3b66be5ef83e2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 19 Apr 2012 20:36:09 +0200
Subject: Partially revert commit 5efbe805c553a2ac21a79386c3e2147858d4308b -
 Linux / Solaris x86* requires stdlib.

---
 make/gluegen-cpptasks-base.xml            | 30 ------------------------------
 make/lib/gluegen-cpptasks-linux-32bit.xml |  2 --
 2 files changed, 32 deletions(-)

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 3185430..0a895fc 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1096,65 +1096,41 @@
     <!-- Unix linker configuration -->
 
     <linker id="linker.cfg.linux" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.x86" name="gcc">
       <linkerarg value="-m32"/>
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.amd64" name="gcc">
       <linkerarg value="-m64"/>
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.armv7" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.alpha" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.hppa" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.mips" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.mipsel" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.ppc" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.s390" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.s390x" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <linker id="linker.cfg.linux.sparc" name="gcc">
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <compiler id="linker.cfg.android" name="gcc">
@@ -1176,21 +1152,15 @@
 
     <linker id="linker.cfg.solaris" name="gcc"> 
       <linkerarg value="-m32"/>
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker> 
 
     <linker id="linker.cfg.solaris.sparcv9" name="gcc"> 
       <linkerarg value="-xarch=v9a" /> 
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker> 
 
     <linker id="linker.cfg.solaris.amd64" name="gcc"> 
       <linkerarg value="-m64"/>
       <!-- linkerarg value="-xarch=amd64" / --> 
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
     <!-- MacOSX linker configuration -->
diff --git a/make/lib/gluegen-cpptasks-linux-32bit.xml b/make/lib/gluegen-cpptasks-linux-32bit.xml
index 6a70818..c05033d 100644
--- a/make/lib/gluegen-cpptasks-linux-32bit.xml
+++ b/make/lib/gluegen-cpptasks-linux-32bit.xml
@@ -29,8 +29,6 @@
 
     <linker id="linker.cfg.linux" name="gcc">
       <linkerarg value="-m32" />
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
     </linker>
 
 </target>
-- 
cgit v1.2.3