From ad064d8dd94f44093fe196edd4a2dfb6c3a0a8fa Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 19 Jul 2015 01:21:42 +0200
Subject: GCC Linker Config: Add '-static-libstdc++' in case libstdc++ is being
 linked

Linking libstdc++ dynamically might cause issues on platforms
where a huge variation of named library exists - or none even is installed.
---
 make/lib/gluegen-cpptasks-android-armv6.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'make/lib/gluegen-cpptasks-android-armv6.xml')

diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml
index 46b79eb..57999b2 100644
--- a/make/lib/gluegen-cpptasks-android-armv6.xml
+++ b/make/lib/gluegen-cpptasks-android-armv6.xml
@@ -110,7 +110,8 @@
          <linkerarg value="--demangle" /> 
          <linkerarg value="--gc-sections" /> 
          <linkerarg value="--no-undefined" /> 
-         <linkerarg value="-static-libgcc"/>
+         <linkerarg value="-static-libgcc" if="isGCC"/>
+         <linkerarg value="-static-libstdc++" if="isGCC"/>
          <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told
            where to find libgcc as the default location (gcc -print-search-dirs)
            is not correct. Not sure if this is a bug in the NDK or not. We also
-- 
cgit v1.2.3