diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-27 00:07:04 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-27 00:07:04 +0000 |
| commit | 904e20877c7f9326ca7b25d109ba9e25ce330d49 (patch) | |
| tree | 237839f7e4416ce79f1b22a6ae6636cb7dbfb623 /cmake | |
| parent | a75820f15a1b43cdfdf61227537c0ac6014d95e9 (diff) | |
[CMake] Effectively revert r230683.
Clang in 32-bit mode may choose to target different architecture
than host compiler.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@230709 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config-ix.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 9c4c8deea..1207f4c8c 100644 --- a/cmake/config-ix.cmake +++ b/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() |