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

diff --git a/Makefile.rules b/Makefile.rules
index bf13b26200c050eb4d9fbefe9274bcf19aca3a8b..3c115d2a52e0b4533d1b4091778603c49353e556 100644 (file)
--- 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)