From 4d0586be0ff08b85c73e59e1f0cfa4069f7d5ba8 Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Fri, 7 Apr 2006 08:31:56 +0000
Subject: [PATCH] A saner workaround. I hope.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27483 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile.rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index 933bf0edd9e..affd0fb3598 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) 
-- 
2.34.1