---

yaml
---
r: 347454
b: refs/heads/master
c: 67c4211
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f6b5e51d6f6366e11fbb06f9365c40b8bf524758
+refs/heads/master: 67c4211041515506fa70eaf5acfae9ecaae72c25
 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

@@ -205,7 +205,7 @@ __declspec(dllexport)
 #endif
 _Block_release(void) { }\n")
     _add_swift_library_single(
-      BlocksRuntimeStub-${SDK}-${ARCH}
+      BlocksRuntimeStub${VARIANT_SUFFIX}
       BlocksRuntimeStub
       SHARED
       DONT_EMBED_BITCODE
@@ -214,12 +214,12 @@ _Block_release(void) { }\n")
       SDK ${SDK}
       INSTALL_IN_COMPONENT dev
       ${test_bin_dir}/BlocksRuntime.c)
-    set_target_properties(BlocksRuntimeStub-${SDK}-${ARCH} PROPERTIES
+    set_target_properties(BlocksRuntimeStub${VARIANT_SUFFIX} PROPERTIES
       ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir}
       LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir}
       RUNTIME_OUTPUT_DIRECTORY ${test_bin_dir}
       OUTPUT_NAME BlocksRuntime)
-    list(APPEND test_dependencies BlocksRuntimeStub-${SDK}-${ARCH})
+    list(APPEND test_dependencies BlocksRuntimeStub${VARIANT_SUFFIX})
 
     list(APPEND test_dependencies
         "swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")