diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-12 03:34:19 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-12 03:34:19 +0000 |
| commit | 8bc080358f15ab814822e29795b17dbaceb769e7 (patch) | |
| tree | 844c95faa0e52d5837ec138f798e597b13ceaf0f /Makefile.rules | |
| parent | 054401b9f2f90e07d06ce0550f6df4f4ecbe2f18 (diff) | |
| download | external_llvm-8bc080358f15ab814822e29795b17dbaceb769e7.zip external_llvm-8bc080358f15ab814822e29795b17dbaceb769e7.tar.gz external_llvm-8bc080358f15ab814822e29795b17dbaceb769e7.tar.bz2 | |
Set ARCH to x86 on mixed 32/64-bit Linux systems.
Remove the explicit if OS = Darwin test around the setting of -m32/-m64.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66765 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.rules b/Makefile.rules index 66d90f1..59d8440 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -522,13 +522,11 @@ 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 + ifeq ($(ARCH),x86_64) + CompileCommonOpts += -m64 + else + ifeq ($(ARCH),x86) + CompileCommonOpts += -m32 endif endif endif |