--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig	2015-04-17 18:46:34.000000000 -0700
+++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2015-04-17 18:48:25.000000000 -0700
@@ -119,16 +119,16 @@ UniversalArchs.profile_ios := $(call Che
 UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
 
 # Configurations which define the ASAN support functions.
-Configs += asan_osx_dynamic
+#Configs += asan_osx_dynamic
 UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic,$(OSX_SDK))
 
-Configs += asan_iossim_dynamic
+#Configs += asan_iossim_dynamic
 UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
 
-Configs += ubsan_osx_dynamic
+#Configs += ubsan_osx_dynamic
 UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64,ubsan_osx_dynamic,$(OSX_SDK))
 
-Configs += ubsan_iossim_dynamic
+#Configs += ubsan_iossim_dynamic
 UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
 
 # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
--- a/tools/clang/runtime/compiler-rt/Makefile.orig	2015-04-17 18:46:32.000000000 -0700
+++ b/tools/clang/runtime/compiler-rt/Makefile	2015-04-17 18:48:42.000000000 -0700
@@ -78,9 +78,7 @@ ifeq ($(OS),Darwin)
 RuntimeDirs += darwin macho_embedded
 RuntimeLibrary.darwin.Configs := \
 	eprintf.a 10.4.a osx.a cc_kext.a \
-	asan_osx_dynamic.dylib \
-	profile_osx.a \
-	ubsan_osx_dynamic.dylib
+	profile_osx.a
 
 XCRunSdkPath = \
   $(shell \
@@ -103,11 +101,6 @@ ifneq ($(IOS_SDK),)
 RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
 endif
 
-ifneq ($(IOSSIM_SDK),)
-RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \
-                                 ubsan_iossim_dynamic.dylib
-endif
-
 RuntimeLibrary.macho_embedded.Configs := \
 	hard_static.a hard_pic.a
 ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))