diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2017-12-05 13:32:37 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:42:17 +0000 |
| commit | ab4907325ea264efc26b89ebad7e10522cb823e5 (patch) | |
| tree | e86a9e3b9c126face00b18b1783bea7ba454f181 /SConscript | |
| parent | f8b41e984577bb822e5984584aaf7c0b69394d51 (diff) | |
| download | ComputeLibrary-ab4907325ea264efc26b89ebad7e10522cb823e5.tar.gz | |
COMPMID-556 Fix build issues with Clang
Cleaned up build system a bit
Change-Id: I476deb5e8998653a15d018dc332d43c1d439d4c6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111917
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/SConscript b/SConscript index b40b66caab..91dc60166a 100644 --- a/SConscript +++ b/SConscript @@ -201,24 +201,18 @@ if env['gles_compute']: generate_embed.append(arm_compute_env.Command(embed_files, cs_files, action=resolve_includes)) -static_core_objects = [arm_compute_env.StaticObject(f) for f in core_files] -shared_core_objects = [arm_compute_env.SharedObject(f) for f in core_files] - -arm_compute_core_a = build_library('arm_compute_core-static', static_core_objects, static=True) +arm_compute_core_a = build_library('arm_compute_core-static', core_files, static=True) Export('arm_compute_core_a') if env['os'] != 'bare_metal' and not env['standalone']: - arm_compute_core_so = build_library('arm_compute_core', shared_core_objects, static=False) + arm_compute_core_so = build_library('arm_compute_core', core_files, static=False) Export('arm_compute_core_so') -shared_runtime_objects = [arm_compute_env.SharedObject(f) for f in runtime_files] -static_runtime_objects = [arm_compute_env.StaticObject(f) for f in runtime_files] - -arm_compute_a = build_library('arm_compute-static', static_runtime_objects, static=True, libs = [ arm_compute_core_a ]) +arm_compute_a = build_library('arm_compute-static', runtime_files, static=True, libs = [ arm_compute_core_a ]) Export('arm_compute_a') if env['os'] != 'bare_metal' and not env['standalone']: - arm_compute_so = build_library('arm_compute', shared_runtime_objects, static=False, libs = [ "arm_compute_core" ]) + arm_compute_so = build_library('arm_compute', runtime_files, static=False, libs = [ "arm_compute_core" ]) Depends(arm_compute_so, arm_compute_core_so) Export('arm_compute_so') |