From 2539dd24acbd28fc666e3ba8d9d5dc6330d7f03c Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 15 Mar 2018 14:16:52 +0000 Subject: 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 Tested-by: Jenkins --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'SConstruct') 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': -- cgit v1.2.1