diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-05-16 11:58:52 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:52:54 +0000 |
| commit | 7fb7b61fea9f2cc0e9c446b41f3472c547d64645 (patch) | |
| tree | cdb4e44e458a5df6de85f2ff746bf364b64bb7ce /examples/SConscript | |
| parent | d30ed1149da417a5a0c76a48ca08c18a0006be52 (diff) | |
| download | ComputeLibrary-7fb7b61fea9f2cc0e9c446b41f3472c547d64645.tar.gz | |
COMPMID-959: Fixed linking issue
Was only failing for armv8.2-a for some reason
Change-Id: I3ee706aee22b7f1fb8223d0f6cc2e09bec7672ea
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/131443
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'examples/SConscript')
| -rw-r--r-- | examples/SConscript | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/SConscript b/examples/SConscript index 230305b5ea..c3576fb1a0 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -47,17 +47,18 @@ else: # Build graph examples graph_utils = examples_env.Object("../utils/GraphUtils.cpp") +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 = arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) + 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']) Depends(prog, graph_dependency) else: #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) Depends(prog, graph_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -65,7 +66,7 @@ for file in Glob("./graph_*.cpp"): if env['opencl'] and env['neon']: for file in Glob("./neoncl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -73,7 +74,7 @@ if env['opencl'] and env['neon']: if env['opencl']: for file in Glob("./cl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -81,7 +82,7 @@ if env['opencl']: if env['neon']: for file in Glob("./neon_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -89,7 +90,7 @@ if env['neon']: if env['gles_compute']: for file in Glob("./gc_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) |