[compiler-rt] r254249 - Fixup for r254228 ("Port tsan_rtl_amd64.S to OS X to add support for setjmp/longjmp") to fix the build of unit tests. We need to add the ASM file into RTTsan_dynamic as well.

[Kuba Brecka via llvm-commits]

Author: kuba.brecka
Date: Sun Nov 29 02:48:47 2015
New Revision: 254249

URL: http://llvm.org/viewvc/llvm-project?rev=254249&view=rev
Log:
Fixup for r254228 ("Port tsan_rtl_amd64.S to OS X to add support for setjmp/longjmp") to fix the build of unit tests.  We need to add the ASM file into RTTsan_dynamic as well.


Modified:
    compiler-rt/trunk/lib/tsan/CMakeLists.txt

Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=254249&r1=254248&r2=254249&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Sun Nov 29 02:48:47 2015
@@ -88,12 +88,6 @@ set(TSAN_HEADERS
 set(TSAN_RUNTIME_LIBRARIES)
 add_custom_target(tsan)
 
-add_compiler_rt_object_libraries(RTTsan_dynamic 
-  OS ${TSAN_SUPPORTED_OS}
-  ARCHS ${TSAN_SUPPORTED_ARCH}
-  SOURCES ${TSAN_SOURCES} ${TSAN_CXX_SOURCES}
-  CFLAGS ${TSAN_RTL_CFLAGS})
-
 if(APPLE)
   set(TSAN_ASM_SOURCES rtl/tsan_rtl_amd64.S)
   # Xcode will try to compile this file as C ('clang -x c'), and that will fail.
@@ -114,6 +108,11 @@ if(APPLE)
                 RTUbsan
     CFLAGS ${TSAN_RTL_CFLAGS}
     PARENT_TARGET tsan)
+  add_compiler_rt_object_libraries(RTTsan_dynamic 
+    OS ${TSAN_SUPPORTED_OS}
+    ARCHS ${TSAN_SUPPORTED_ARCH}
+    SOURCES ${TSAN_SOURCES} ${TSAN_CXX_SOURCES} ${TSAN_ASM_SOURCES}
+    CFLAGS ${TSAN_RTL_CFLAGS})
 else()
   foreach(arch ${TSAN_SUPPORTED_ARCH})
     if(arch STREQUAL "x86_64")