From 9873ea3f1ea238ba7abfb635807614517c52be4b Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Tue, 5 Dec 2017 15:28:55 +0000
Subject: COMPMID-556: Revert COMPMID-652

Revert back to static linkage for android as dynamic linkage causes
error within libc++

Change-Id: I448dd5ff4e527b81d702e331bd070101431fb7de
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111995
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index e7504228d3..9f772f408b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -188,7 +188,7 @@ if env['Werror']:
 
 if env['os'] == 'android':
     env.Append(CPPDEFINES = ['ANDROID'])
-    env.Append(LINKFLAGS = ['-pie'])
+    env.Append(LINKFLAGS = ['-pie', '-static-libstdc++'])
 elif env['os'] == 'bare_metal':
     env.Append(LINKFLAGS = ['-static'])
     env.Append(LINKFLAGS = ['-specs=rdimon.specs'])
-- 
cgit v1.2.1