commit 1e41b13a4c5c278ef1c0ea0211d47f31a604e58a
author Devin Coughlin <dcoughlin@apple.com> Fri Apr 05 21:19:39 2019 -0700
committer GitHub <noreply@github.com> Fri Apr 05 21:19:39 2019 -0700
tree d9d58aac819f4d0158f43e21b70c7d3de85a2e8f
parent 6ef5fb57f0aed2355d8509f1048d6ae056fd093b
parent d2562856e0548dc80fd93091ad2e5efd17c2a787

Merge pull request #23835 from devincoughlin/blocks-runtime-stubs-variant-suffix

[CMake] Change tests BlocksRuntimeStub to use VARIANT_SUFFIX

test/CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5f1598c..74ee9b2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -205,7 +205,7 @@
 #endif
 _Block_release(void) { }\n")
     _add_swift_library_single(
-      BlocksRuntimeStub-${SDK}-${ARCH}
+      BlocksRuntimeStub${VARIANT_SUFFIX}
       BlocksRuntimeStub
       SHARED
       DONT_EMBED_BITCODE
@@ -214,12 +214,12 @@
       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}")