diff --git a/Makefile.rules b/Makefile.rules
index 911bc36b57d..779e0a6933b 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -228,7 +228,7 @@ else
     BuildMode := Debug
     CXX.Flags := -g
     C.Flags   := -g
-    LD.Flags  := -g 
+    LD.Flags  := -g
     KEEP_SYMBOLS := 1
   endif
 endif
@@ -395,11 +395,6 @@ ifdef UNIVERSAL
   DISABLE_AUTO_DEPENDENCIES=1
 endif
 
-# Temporary workaround for a Mac OSX compatibility issue.
-ifeq ($(OS),Darwin)
-  CXX.Flags += -fno-use-cxa-atexit
-endif
-
 LD.Flags      += -L$(LibDir) -L$(LLVMLibDir) 
 CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
 # All -I flags should go here, so that they don't confuse llvm-config.