summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-08-07 12:14:29 +0000
committerAlexey Samsonov <samsonov@google.com>2012-08-07 12:14:29 +0000
commit36796b4899253017b0e9a24955f93cbe7eb6c571 (patch)
tree7aa22fa26dc0773b8c11e3ad1b68e962ae4d3626 /compiler-rt
parent947228c4f7f9b6a8f399c9e91b7bf9e8af55eef0 (diff)
downloadbcm5719-llvm-36796b4899253017b0e9a24955f93cbe7eb6c571.tar.gz
bcm5719-llvm-36796b4899253017b0e9a24955f93cbe7eb6c571.zip
[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
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
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()
OpenPOWER on IntegriCloud