aboutsummaryrefslogtreecommitdiff
path: root/tests/SConscript
diff options
context:
space:
mode:
authorPablo Tello <pablo.tello@arm.com>2017-06-21 15:39:47 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-09-17 14:14:20 +0100
commitc6cb35a1935cde168f4b72d8782c21a344e78623 (patch)
treebdd5ec8c02702868d6a0b63db49c9bb3e5a253e0 /tests/SConscript
parentee12254d4aae887ba654aa26bebc2e1330fc0a88 (diff)
downloadComputeLibrary-c6cb35a1935cde168f4b72d8782c21a344e78623.tar.gz
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 <jeremy.johnson+kaizengerrit@arm.com> Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/SConscript')
-rw-r--r--tests/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/SConscript b/tests/SConscript
index 6be4ddb35e..8da1d2fa33 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -24,8 +24,6 @@ import os.path
Import('env')
Import('vars')
-Import('arm_compute_a')
-Import('arm_compute_so')
# vars is imported from arm_compute:
variables = [
@@ -49,10 +47,12 @@ vars.Update(common_env)
Help(new_options.GenerateHelpText(common_env))
-if env['os'] in ['android', 'bare_metal']:
+if env['os'] in ['android', 'bare_metal'] or env['standalone']:
+ Import('arm_compute_a')
common_env.Append(LIBS = [arm_compute_a])
arm_compute_lib = arm_compute_a
else:
+ Import('arm_compute_so')
common_env.Append(LIBS = ["arm_compute"])
arm_compute_lib = arm_compute_so