From 9873ea3f1ea238ba7abfb635807614517c52be4b Mon Sep 17 00:00:00 2001 From: Georgios Pinitas 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 Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com --- SConscript | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'SConscript') diff --git a/SConscript b/SConscript index 3637858626..2544d1f64c 100644 --- a/SConscript +++ b/SConscript @@ -231,17 +231,16 @@ if env['neon'] and env['opencl']: shared_graph_objects = [arm_compute_env.SharedObject(f) for f in graph_files] static_graph_objects = [arm_compute_env.StaticObject(f) for f in graph_files] - #FIXME OpenCL can't be linked statically: revisit when we can have a NEON only build of the graph library - #arm_compute_graph_a = build_library('arm_compute_graph-static', static_graph_objects, static=True, libs = [ arm_compute_a ]) - #Export('arm_compute_graph_a') + arm_compute_graph_a = build_library('arm_compute_graph-static', static_graph_objects, static=True, libs = [ arm_compute_a ]) + Export('arm_compute_graph_a') arm_compute_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']]) arm_compute_graph_so = build_library('arm_compute_graph', shared_graph_objects, static=False, libs = [ "arm_compute", "arm_compute_core", "OpenCL" ]) - Depends(arm_compute_graph_so, [ arm_compute_so, opencl]) + Depends(arm_compute_graph_so, arm_compute_so) + Depends(arm_compute_graph_so, opencl) Export('arm_compute_graph_so') - #graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_a, arm_compute_graph_so]) - graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_so]) + graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_a, arm_compute_graph_so]) Default(graph_alias) if env['standalone']: -- cgit v1.2.1