From 9e40cf7c21ed0136150101d6c930417d475ecff1 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Fri, 15 Sep 2017 16:14:55 +0100 Subject: COMPMID-417: Fixed broken scons script to build bare_metal and related compiler errors. Change-Id: I5f2d6c8b199698a5c2622254696da7034cef1b50 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87928 Tested-by: Kaizen Reviewed-by: Michalis Spyrou --- SConstruct | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index b46f775541..50370d34c3 100644 --- a/SConstruct +++ b/SConstruct @@ -124,9 +124,10 @@ elif env['arch'] == 'arm64-v8a': elif env['arch'] == 'arm64-v8.2-a': env.Append(CXXFLAGS = ['-march=armv8.2-a+fp16+simd']) env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_FP16']) - - if env['os'] in ['linux', 'bare_metal']: + if env['os'] == 'linux': prefix = "aarch64-linux-gnu-" + elif env['os'] == 'bare_metal': + prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" elif env['arch'] == 'x86_32': @@ -218,4 +219,5 @@ if env['opencl']: if env['examples']: SConscript('./examples/SConscript', variant_dir='#build/%s/examples' % env['build_dir'], duplicate=0) -SConscript('./tests/SConscript', variant_dir='#build/%s/tests' % env['build_dir'], duplicate=0) +if env['os'] != 'bare_metal': + SConscript('./tests/SConscript', variant_dir='#build/%s/tests' % env['build_dir'], duplicate=0) -- cgit v1.2.1