From 655bd0200cd2f85deb6a843db4c8c23d2f8a66bc Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Fri, 27 Feb 2015 00:07:04 +0000 Subject: [CMake] Effectively revert r230683. Clang in 32-bit mode may choose to target different architecture than host compiler. llvm-svn: 230709 --- compiler-rt/cmake/config-ix.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler-rt') diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 9c4c8deeaea..1207f4c8c79 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -161,10 +161,11 @@ else() if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") if(NOT MSVC) test_target_arch(x86_64 "" "-m64") + # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may + # target different variant than "$CMAKE_C_COMPILER -m32". This part should + # be gone after we resolve PR14109. test_target_arch(i686 __i686__ "-m32") - if(NOT CAN_TARGET_i686) - test_target_arch(i386 __i386__ "-m32") - endif() + test_target_arch(i386 __i386__ "-m32") else() test_target_arch(i386 "" "") endif() -- cgit v1.2.3