From c6cb35a1935cde168f4b72d8782c21a344e78623 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Wed, 21 Jun 2017 15:39:47 +0100 Subject: COMPMID-345: Updated scons scripts to link computer_vision statically against libgcc, libstdc++ and computer_vision. This is needed to run 'computer_vision' on the ARM 8.2-a + FP16 Fast model. Change-Id: I66d6427e4d4117b7995c35ec9df1dea5b3f22205 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78429 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- SConscript | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'SConscript') diff --git a/SConscript b/SConscript index 970466e5ae..a53501d405 100644 --- a/SConscript +++ b/SConscript @@ -178,7 +178,7 @@ shared_core_objects = [arm_compute_env.SharedObject(f) for f in core_files] arm_compute_core_a = build_library('arm_compute_core-static', static_core_objects, static=True) Export('arm_compute_core_a') -if env['os'] != 'bare_metal': +if env['os'] != 'bare_metal' and not env['standalone']: arm_compute_core_so = build_library('arm_compute_core', shared_core_objects, static=False) Export('arm_compute_core_so') @@ -188,12 +188,20 @@ static_objects = [arm_compute_env.StaticObject(f) for f in files] arm_compute_a = build_library('arm_compute-static', static_core_objects + static_objects, static=True) Export('arm_compute_a') -if env['os'] != 'bare_metal': +if env['os'] != 'bare_metal' and not env['standalone']: arm_compute_so = build_library('arm_compute', shared_core_objects + shared_objects, static=False) Export('arm_compute_so') -alias = arm_compute_env.Alias("arm_compute", [arm_compute_a, arm_compute_so]) +if env['standalone']: + alias = arm_compute_env.Alias("arm_compute", [arm_compute_a]) +else: + alias = arm_compute_env.Alias("arm_compute", [arm_compute_a, arm_compute_so]) + Default(alias) Default(generate_embed) -Depends([alias,arm_compute_core_so, arm_compute_core_a], generate_embed) + +if env['standalone']: + Depends([alias,arm_compute_core_a], generate_embed) +else: + Depends([alias,arm_compute_core_so, arm_compute_core_a], generate_embed) -- cgit v1.2.1