commit 9873ea3f1ea238ba7abfb635807614517c52be4b
author Georgios Pinitas <georgios.pinitas@arm.com> Tue Dec 05 15:28:55 2017 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:42:17 2018 +0000
tree f9e7e025fc905de39296a4832a02397e666720b0
parent b8ab99788c3310800880346b1a935361e9974fa9

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

diff --git a/SConstruct b/SConstruct
index e750422..9f772f4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -188,7 +188,7 @@
 
 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'])