aboutsummaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAnthony Barbier <anthony.barbier@arm.com>2018-03-15 14:16:52 +0000
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:49:16 +0000
commit2539dd24acbd28fc666e3ba8d9d5dc6330d7f03c (patch)
tree74129239bc8d7cf1152c2788aa2230b4dba8fbb3 /SConstruct
parent7e4b23953e885e58d655a7d9f35a1afcc38365e4 (diff)
downloadComputeLibrary-2539dd24acbd28fc666e3ba8d9d5dc6330d7f03c.tar.gz
COMPMID-959: Fixed -no-integrated-as flag for Android
Change-Id: I40a2c727671780e04518ea36694511ab42e4ece4 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124728 Reviewed-by: Pablo Tello <pablo.tello@arm.com> Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct3
1 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index cb0cb4fd0a..b55075ed4a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -142,12 +142,13 @@ elif env['arch'] == 'arm64-v8a':
prefix = "aarch64-elf-"
elif env['os'] == 'android':
prefix = "aarch64-linux-android-"
+ if 'clang++' in cpp_compiler:
env.Append(CXXFLAGS = ['-no-integrated-as'])
elif env['arch'] == 'arm64-v8.2-a':
env.Append(CXXFLAGS = ['-march=armv8.2-a+fp16']) # explicitly enable fp16 extension otherwise __ARM_FEATURE_FP16_VECTOR_ARITHMETIC is undefined
env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8_2','NO_DOT_IN_TOOLCHAIN'])
if 'clang++' in cpp_compiler:
- env.Append(CXXFLAGS = ['-fno-integrated-as'])
+ env.Append(CXXFLAGS = ['-no-integrated-as'])
if env['os'] == 'linux':
prefix = "aarch64-linux-gnu-"
elif env['os'] == 'bare_metal':