From 36796b4899253017b0e9a24955f93cbe7eb6c571 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Tue, 7 Aug 2012 12:14:29 +0000 Subject: [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 llvm-svn: 161415 --- compiler-rt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler-rt') diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 97835a1e945..d8985c216b4 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 2.8.8) # 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() -- cgit v1.2.3