A saner workaround. I hope.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27483 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 933bf0edd9ed6f2ef15d99a65d3aeb1f28506226..affd0fb35989c2450c7242e4b7f947d2fd6164e9 100644 (file)
--- 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)