---

yaml
---
r: 347422
b: refs/heads/master
c: 022b6d0
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a8a47c237e3329073c9c74b3f4a98b8df541dc31
+refs/heads/master: 022b6d040dadbfcbd0ef947023319bb4fbe53025
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/CMakeLists.txt

@@ -204,13 +204,16 @@ foreach(SDK ${SWIFT_SDKS})
 __declspec(dllexport)
 #endif
 _Block_release(void) { }\n")
-    add_library(BlocksRuntimeStub-${SDK}-${ARCH} SHARED
+    _add_swift_library_single(
+      BlocksRuntimeStub-${SDK}-${ARCH}
+      BlocksRuntimeStub
+      SHARED
+      DONT_EMBED_BITCODE
+      NOSWIFTRT
+      ARCHITECTURE ${ARCH}
+      SDK ${SDK}
+      INSTALL_IN_COMPONENT dev
       ${test_bin_dir}/BlocksRuntime.c)
-    if(CMAKE_C_COMPILER_ID STREQUAL Clang AND
-        NOT CMAKE_C_COMPILER_SIMULATE_ID STREQUAL MSVC)
-      target_compile_options(BlocksRuntimeStub-${SDK}-${ARCH} PRIVATE
-        -target;${SWIFT_SDK_${SDK}_ARCH_${ARCH}_TRIPLE})
-    endif()
     set_target_properties(BlocksRuntimeStub-${SDK}-${ARCH} PROPERTIES
       ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir}
       LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir}