summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
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)