Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit ae18f30

Browse files
author
Jorge Aparicio
committed
don't test the soft ABI on arm*-*-*-*eabihf targets
and vice versa don't test the hard ABI on arm*-*-*-eabi targets. These tests wouldn't pass anyway and this avoids a build error on *eabihf targets.
1 parent b6087e8 commit ae18f30

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmake/config-ix.cmake

+5-2
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,11 @@ elseif(NOT APPLE) # Supported archs for Apple platforms are generated later
207207
test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
208208
test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=n64")
209209
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
210-
test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
211-
test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
210+
if("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES "eabihf")
211+
test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
212+
else()
213+
test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
214+
endif()
212215
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
213216
test_target_arch(aarch32 "" "-march=armv8-a")
214217
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")

0 commit comments

Comments
 (0)