diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 8fd9e63f6e..33cc72cf0d 100644 --- a/SConstruct +++ b/SConstruct @@ -180,15 +180,13 @@ if env['arch'] == 'armv7a': env.Append(CXXFLAGS = ['-mfloat-abi=softfp']) elif env['arch'] == 'arm64-v8a': env.Append(CXXFLAGS = ['-march=armv8-a']) - env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8A','NO_DOT_IN_TOOLCHAIN']) + env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8A']) if env['os'] == 'linux': prefix = "aarch64-linux-gnu-" elif env['os'] == 'bare_metal': prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" - if 'clang++' in cpp_compiler: - env.Append(CXXFLAGS = ['-no-integrated-as']) elif 'arm64-v8.2-a' in env['arch']: if env['arch'] == 'arm64-v8.2-a-sve': env.Append(CXXFLAGS = ['-march=armv8.2-a+sve+fp16+dotprod']) @@ -200,9 +198,7 @@ elif 'arm64-v8.2-a' in env['arch']: prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" - env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8_2','NO_DOT_IN_TOOLCHAIN']) - if 'clang++' in cpp_compiler: - env.Append(CXXFLAGS = ['-no-integrated-as']) + env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8_2']) elif env['arch'] == 'x86_32': env.Append(CCFLAGS = ['-m32']) env.Append(LINKFLAGS = ['-m32']) @@ -211,10 +207,6 @@ elif env['arch'] == 'x86_64': env.Append(CCFLAGS = ['-m64']) env.Append(LINKFLAGS = ['-m64']) -# Rework flags depending on compiler version -if 'armclang' in cpp_compiler: - if 'NO_DOT_IN_TOOLCHAIN' in env['CPPDEFINES']: env['CPPDEFINES'].remove('NO_DOT_IN_TOOLCHAIN') - if env['build'] == 'native': prefix = "" |