diff options
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/SConscript b/SConscript index 17220e4c29..b40b66caab 100644 --- a/SConscript +++ b/SConscript @@ -125,6 +125,8 @@ def create_version_file(target, source, env): arm_compute_env = env.Clone() +# Don't allow undefined references in the libraries: +arm_compute_env.Append(LINKFLAGS=['-Wl,--no-undefined','-Wl,--no-allow-shlib-undefined']) generate_embed = [ arm_compute_env.Command("src/core/arm_compute_version.embed", "", action=create_version_file) ] arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] ) @@ -232,16 +234,17 @@ if env['neon'] and env['opencl']: shared_graph_objects = [arm_compute_env.SharedObject(f) for f in graph_files] static_graph_objects = [arm_compute_env.StaticObject(f) for f in graph_files] - arm_compute_graph_a = build_library('arm_compute_graph-static', static_graph_objects, static=True, libs = [ arm_compute_a ]) - Export('arm_compute_graph_a') + #FIXME OpenCL can't be linked statically: revisit when we can have a NEON only build of the graph library + #arm_compute_graph_a = build_library('arm_compute_graph-static', static_graph_objects, static=True, libs = [ arm_compute_a ]) + #Export('arm_compute_graph_a') arm_compute_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']]) arm_compute_graph_so = build_library('arm_compute_graph', shared_graph_objects, static=False, libs = [ "arm_compute", "arm_compute_core", "OpenCL" ]) - Depends(arm_compute_graph_so, arm_compute_so) - Depends(arm_compute_graph_so, opencl) + Depends(arm_compute_graph_so, [ arm_compute_so, opencl]) Export('arm_compute_graph_so') - graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_a, arm_compute_graph_so]) + #graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_a, arm_compute_graph_so]) + graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_so]) Default(graph_alias) if env['standalone']: |