summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2009-03-09 18:28:37 +0000
committerEvan Cheng <evan.cheng@apple.com>2009-03-09 18:28:37 +0000
commitc785b4f4a613f3e553651f7c0dbed4c6d8b5af47 (patch)
tree766bcffae53f75ec4881335a77fdcdf645605226 /Makefile.rules
parent9aaa0796adff54dd6282e8ead6d3d9f2ab7eea22 (diff)
downloadllvm-c785b4f4a613f3e553651f7c0dbed4c6d8b5af47.tar.gz
llvm-c785b4f4a613f3e553651f7c0dbed4c6d8b5af47.tar.bz2
llvm-c785b4f4a613f3e553651f7c0dbed4c6d8b5af47.tar.xz
Re-apply 66315, but restrict it to Darwin only.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66427 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index bf13b26200..3c115d2a52 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -519,6 +519,16 @@ ifdef UNIVERSAL
# Building universal cannot compute dependencies automatically.
DISABLE_AUTO_DEPENDENCIES=1
+else
+ ifeq ($(OS),Darwin)
+ ifeq ($(ARCH),x86_64)
+ CompileCommonOpts += -m64
+ else
+ ifeq ($(ARCH),x86)
+ CompileCommonOpts += -m32
+ endif
+ endif
+ endif
endif
ifeq ($(OS),SunOS)