diff options
| author | Bill Wendling <isanbard@gmail.com> | 2009-03-12 04:10:09 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2009-03-12 04:10:09 +0000 |
| commit | a0833356fef7dd36631c1f5dced66556e3cc1016 (patch) | |
| tree | fc296c639937078383009984f76a269f8f2239b2 /Makefile.rules | |
| parent | fb13881d4aa6f1cf5edc9e74c276690103d1da3f (diff) | |
| download | llvm-a0833356fef7dd36631c1f5dced66556e3cc1016.tar.gz llvm-a0833356fef7dd36631c1f5dced66556e3cc1016.tar.bz2 llvm-a0833356fef7dd36631c1f5dced66556e3cc1016.tar.xz | |
Revert r66765 and r66766. These were causing build failures on Darwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66770 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index 59d844010b..66d90f1209 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -522,11 +522,13 @@ ifdef UNIVERSAL # Building universal cannot compute dependencies automatically. DISABLE_AUTO_DEPENDENCIES=1 else - ifeq ($(ARCH),x86_64) - CompileCommonOpts += -m64 - else - ifeq ($(ARCH),x86) - CompileCommonOpts += -m32 + ifeq ($(OS),Darwin) + ifeq ($(ARCH),x86_64) + CompileCommonOpts += -m64 + else + ifeq ($(ARCH),x86) + CompileCommonOpts += -m32 + endif endif endif endif |