diff -Naurp trunk.orig/projects/compiler-rt/make/platform/clang_darwin.mk trunk/projects/compiler-rt/make/platform/clang_darwin.mk
--- a/projects/compiler-rt/make/platform/clang_darwin.mk	2012-10-11 21:56:32.000000000 -0700
+++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2012-10-11 22:03:39.000000000 -0700
@@ -58,11 +58,11 @@ Configs += profile_osx
 UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
 
 # Configurations which define the ASAN support functions.
-Configs += asan_osx
-UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
-
-Configs += asan_osx_dynamic
-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
+#Configs += asan_osx
+#UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
+#
+#Configs += asan_osx_dynamic
+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
 
 # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
 # are intended to support and limit what we try to build to that.
--- a/tools/clang/runtime/compiler-rt/Makefile.orig	2012-10-12 01:42:13.000000000 -0700
+++ b/tools/clang/runtime/compiler-rt/Makefile	2012-10-12 09:24:08.000000000 -0700
@@ -75,7 +75,6 @@ ifeq ($(OS),Darwin)
 RuntimeDirs += darwin
 RuntimeLibrary.darwin.Configs := \
 	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
-	asan_osx.a asan_osx_dynamic.dylib \
 	profile_osx.a profile_ios.a
 endif