aboutsummaryrefslogtreecommitdiff
path: root/examples/SConscript
diff options
context:
space:
mode:
authorAnthony Barbier <anthony.barbier@arm.com>2018-07-13 11:52:37 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:54:54 +0000
commit8ddab14db8ee442edd3b98756c19175ddac232b9 (patch)
treef41d5d10a72bbaaf4b14668c581e3f8cb35a780f /examples/SConscript
parent6ed43b58e74281cbdde2219962048bc36d560a3b (diff)
downloadComputeLibrary-8ddab14db8ee442edd3b98756c19175ddac232b9.tar.gz
COMPMID-1246: Don't link against the Graph library for non-graph examples
Change-Id: Iaba620c72e812e66ab7e0c425b0d8a1fdd305d1e Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139862 Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com> Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'examples/SConscript')
-rw-r--r--examples/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/SConscript b/examples/SConscript
index bada734659..098dd5b85e 100644
--- a/examples/SConscript
+++ b/examples/SConscript
@@ -36,12 +36,14 @@ if env['os'] in ['android', 'bare_metal'] or env['standalone']:
Import('arm_compute_a')
Import('arm_compute_core_a')
arm_compute_libs = [ arm_compute_a, arm_compute_core_a ]
+ arm_compute_graph_libs = arm_compute_libs # The graph library needs to be linked separately with --whole-archive
arm_compute_dependency = arm_compute_a
graph_dependency = [arm_compute_graph_a]
else:
Import('arm_compute_graph_so')
Import('arm_compute_so')
- arm_compute_libs = ["arm_compute_graph", "arm_compute", "arm_compute_core"]
+ arm_compute_libs = ["arm_compute", "arm_compute_core"]
+ arm_compute_graph_libs = [ "arm_compute_graph" ] + arm_compute_libs
arm_compute_dependency = arm_compute_so
graph_dependency = [arm_compute_graph_so]
@@ -52,7 +54,6 @@ examples_libs = examples_env.get("LIBS",[])
for file in Glob("./graph_*.cpp"):
example = os.path.basename(os.path.splitext(str(file))[0])
prog = None
- arm_compute_graph_libs = arm_compute_libs
if env['os'] in ['android', 'bare_metal'] or env['standalone']:
prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive'])