commit 3ea9e33ea25e0c2b12db56418ba3f994eb662c04
author Pirama Arumuga Nainar <pirama@google.com> Wed Apr 08 08:57:32 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Wed Apr 08 08:57:32 2015 -0700
tree 637e49f749220fd9b0141bff6bbe5ee972fdedd6
parent ce7e695396b9715fd06e18f7412c860a313661cd

Update aosp/master clang for rebase to r233350

Change-Id: I12d4823f10bc9e445b8b86e7721b71f98d1df442

runtime/compiler-rt/Makefile

diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index c310453..9976438 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -79,7 +79,7 @@
 	eprintf.a 10.4.a osx.a cc_kext.a \
 	asan_osx_dynamic.dylib \
 	profile_osx.a \
-	ubsan_osx.a
+	ubsan_osx_dynamic.dylib
 
 IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
 IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
@@ -93,7 +93,8 @@
 endif
 
 ifneq ($(IOSSIM_SDK),)
-RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib
+RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \
+                                 ubsan_iossim_dynamic.dylib
 endif
 
 RuntimeLibrary.macho_embedded.Configs := \