From 97c3018aac1e2d5fbe55b9542d586b597c060976 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 17 May 2013 23:57:24 +0000
Subject: [PATCH] Fix the UBSan CMake build broken in r182118

llvm-svn: 182177
---
 compiler-rt/lib/sanitizer_common/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
index 3d0654523d11..e0195f492b26 100644
--- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -83,7 +83,9 @@ else()
     add_compiler_rt_object_library(RTSanitizerCommonLibc ${arch}
       SOURCES ${SANITIZER_LIBCDEP_SOURCES} CFLAGS ${SANITIZER_CFLAGS})
     add_compiler_rt_static_runtime(clang_rt.san-${arch} ${arch}
-      SOURCES ${SANITIZER_SOURCES} CFLAGS ${SANITIZER_CFLAGS})
+      SOURCES ${SANITIZER_SOURCES}
+      $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}> CFLAGS
+      ${SANITIZER_CFLAGS})
     list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.${arch})
   endforeach()
 endif()