diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2017-10-04 15:40:38 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 6e52ba3af3c0c22de6d340b18a8e186c4f362005 (patch) | |
tree | 8b9138bc9123fa5e8d83ce6285b94c1fc7309d34 /SConstruct | |
parent | ecfd4d318fe53cb508c988b33dd2f9907dbb2a36 (diff) | |
download | ComputeLibrary-6e52ba3af3c0c22de6d340b18a8e186c4f362005.tar.gz |
COMPMID-417 Use aarch64-elf and arm-eabi toolchains
Change toolchain for arm64-v8a and armv7a and disable
examples when building for bare_metal.
Change-Id: I09c22cc9aad4d32a8e521c36fec98acad2b4d855
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90207
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index ba52666f39..4428a09cd0 100644 --- a/SConstruct +++ b/SConstruct @@ -108,7 +108,7 @@ if env['arch'] == 'armv7a': prefix = "arm-linux-gnueabihf-" env.Append(CXXFLAGS = ['-mfloat-abi=hard']) elif env['os'] == 'bare_metal': - prefix = "arm-none-eabi-" + prefix = "arm-eabi-" env.Append(CXXFLAGS = ['-mfloat-abi=hard']) elif env['os'] == 'android': prefix = "arm-linux-androideabi-" @@ -119,7 +119,7 @@ elif env['arch'] == 'arm64-v8a': if env['os'] == 'linux': prefix = "aarch64-linux-gnu-" elif env['os'] == 'bare_metal': - prefix = "aarch64-none-elf-" + prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" elif env['arch'] == 'arm64-v8.2-a': @@ -217,7 +217,7 @@ SConscript('./SConscript', variant_dir='#build/%s' % env['build_dir'], duplicate if env['opencl']: SConscript("./opencl-1.2-stubs/SConscript", variant_dir="build/%s/opencl-1.2-stubs" % env['build_dir'], duplicate=0) -if env['examples']: +if env['examples'] and env['os'] != 'bare_metal': SConscript('./examples/SConscript', variant_dir='#build/%s/examples' % env['build_dir'], duplicate=0) if env['os'] != 'bare_metal': |