[llvm-commits] CVS: llvm/Makefile.rules

[Evan Cheng]

Changes in directory llvm:

Makefile.rules updated: 1.356 -> 1.357
---
Log message:

A saner workaround. I hope.

---
Diffs of the changes:  (+5 -3)

 Makefile.rules |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.356 llvm/Makefile.rules:1.357
--- llvm/Makefile.rules:1.356	Fri Apr  7 03:10:09 2006
+++ llvm/Makefile.rules	Fri Apr  7 03:31:56 2006
@@ -367,9 +367,11 @@
   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)