summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2006-04-07 08:31:56 +0000
committerEvan Cheng <evan.cheng@apple.com>2006-04-07 08:31:56 +0000
commit4d0586be0ff08b85c73e59e1f0cfa4069f7d5ba8 (patch)
treed6aaf29675fdf149b9166ce5c5d81d1fc511c60c /Makefile.rules
parentafd131ed0b33e0d04cc8b643bfa891e6cb94281d (diff)
downloadllvm-4d0586be0ff08b85c73e59e1f0cfa4069f7d5ba8.tar.gz
llvm-4d0586be0ff08b85c73e59e1f0cfa4069f7d5ba8.tar.bz2
llvm-4d0586be0ff08b85c73e59e1f0cfa4069f7d5ba8.tar.xz
A saner workaround. I hope.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27483 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 933bf0edd9..affd0fb359 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -367,9 +367,11 @@ ifdef UNIVERSAL
DISABLE_AUTO_DEPENDENCIES=1
endif
-# Temporary workaround for a Mac OSX specific issue.
-ifdef NO_CXA_ATEXIT
- CompileCommonOpts += -fno-use-cxa-atexit
+# Temporary workaround for a Mac OSX / x86 compatibility issue.
+ifeq ($(OS),Darwin)
+ifeq ($(ARCH),x86)
+ CXX.Flags += -fno-use-cxa-atexit
+endif
endif
LD.Flags += -L$(LibDir) -L$(LLVMLibDir)