aboutsummaryrefslogtreecommitdiff
path: root/examples/SConscript
diff options
context:
space:
mode:
authorMichalis Spyrou <michalis.spyrou@arm.com>2020-02-07 09:45:55 +0000
committerMichalis Spyrou <michalis.spyrou@arm.com>2020-10-13 09:40:19 +0000
commit6a9e801743b85706177b01e1ffb31320222c4378 (patch)
tree380b7f08fe897f19c397175d7be29d2e747fcc4c /examples/SConscript
parentd056e574f60ca731b2d078e56c6baca5a6c642ac (diff)
downloadComputeLibrary-6a9e801743b85706177b01e1ffb31320222c4378.tar.gz
COMPMID-3830: Support baremetal with gcc7+
Change-Id: I987a1c6b87419a10dd85ecd7f71baad416d359e1 Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4139 Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Diffstat (limited to 'examples/SConscript')
-rw-r--r--examples/SConscript10
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/SConscript b/examples/SConscript
index dc0d3e9655..cd07c6a15a 100644
--- a/examples/SConscript
+++ b/examples/SConscript
@@ -48,6 +48,10 @@ else:
arm_compute_dependency = arm_compute_so
graph_dependency = [arm_compute_graph_so]
+extra_link_flags = []
+if env['os'] != 'bare_metal':
+ extra_link_flags += ['-fstack-protector-strong']
+
# Build graph examples
graph_utils = examples_env.Object("../utils/GraphUtils.cpp")
graph_utils += examples_env.Object("../utils/CommonGraphOptions.cpp")
@@ -57,7 +61,7 @@ for file in Glob("./graph_*.cpp"):
prog = None
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', '-fstack-protector-strong'])
+ 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'] + extra_link_flags)
Depends(prog, graph_dependency)
prog = install_bin(prog)
else:
@@ -109,7 +113,7 @@ if env['neon']:
prog = None
if env['os'] in ['bare_metal']:
- prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LINKFLAGS=examples_env["LINKFLAGS"]+['-fstack-protector'], LIBS = examples_libs + arm_compute_libs)
+ prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LINKFLAGS=examples_env["LINKFLAGS"], LIBS = examples_libs + arm_compute_libs)
else:
prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs)
@@ -133,7 +137,7 @@ for file in Glob("#3rdparty/examples/graph_*.cpp"):
prog = None
if env['os'] in ['android', 'bare_metal'] or env['standalone']:
- prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive', '-fstack-protector-strong'])
+ prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive'] + extra_link_flags)
Depends(prog, graph_dependency)
prog = install_bin(prog)
else: