[llvm-commits] [compiler-rt] r161415 - /compiler-rt/trunk/CMakeLists.txt

[Alexey Samsonov]

Author: samsonov
Date: Tue Aug  7 07:14:29 2012
New Revision: 161415

URL: http://llvm.org/viewvc/llvm-project?rev=161415&view=rev
Log:
[compiler-rt] CMake build: if LLVM_BUILD_32_BITS is on, then -m32 is added to llvm definitions. Let us override this by explicitly adding -m64 compiler flag when building compiler-rt libraries for x86_64 target

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=161415&r1=161414&r2=161415&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Aug  7 07:14:29 2012
@@ -21,7 +21,7 @@
 
 # Detect whether the current target platform is 32-bit or 64-bit, and setup
 # the correct commandline flags needed to attempt to target 32-bit and 64-bit.
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR LLVM_BUILD_32_BITS)
   set(TARGET_X86_64_CFLAGS "-m64")
   set(TARGET_I386_CFLAGS "")
 else()