From bcbb9e6502ace62119d9f1b2e91abecdf2c230d4 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 5 Aug 2016 16:53:05 +0000 Subject: builtins: windows has only one flavour on ARM Windows on ARM is a hard-float only environment. Don't try to build two copies of the same library. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@277834 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/base-config-ix.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cmake/base-config-ix.cmake') diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake index 34d92989e..4f3976d36 100644 --- a/cmake/base-config-ix.cmake +++ b/cmake/base-config-ix.cmake @@ -153,8 +153,12 @@ macro(test_targets) test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=64") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm") - test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") - test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") + if(WIN32) + test_target_arch(arm "" "" "") + else() + test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") + test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") + endif() elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") test_target_arch(aarch32 "" "-march=armv8-a") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64") -- cgit v1.2.3