From 450a3d82c4233f6f1513c9e04a0de7e30cfe1dd5 Mon Sep 17 00:00:00 2001
From: David Farler <dfarler@apple.com>
Date: Wed, 27 Apr 2016 12:55:00 -0700
Subject: [PATCH 1/3] AddSwift: Fix typo in static library dependency append

---
 cmake/modules/AddSwift.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index 2e53266066125..22982cdc0abc0 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -1129,7 +1129,7 @@ function(_add_swift_library_single target name)
   set(SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU)
   foreach(item ${SWIFTLIB_SINGLE_LINK_LIBRARIES})
     if(NOT "${item}" STREQUAL "icucore")
-      list(APPEND SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU "{$item}")
+      list(APPEND SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU "${item}")
     endif()
   endforeach()
 

From ce8905a26b53cdc4801921d90f6ffe7105f1baaf Mon Sep 17 00:00:00 2001
From: David Farler <dfarler@apple.com>
Date: Wed, 27 Apr 2016 12:55:13 -0700
Subject: [PATCH 2/3] test/lit.cfg: swift-reflection-test is a target
 executable

Removes some harmless but annoying log spew.

"swift-reflection-test" only exists on disk as a target executable
with the variant suffix tacked on the end, so don't infer the binary
location.
---
 test/lit.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/lit.cfg b/test/lit.cfg
index 09252991d32ee..270e3752d3400 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -281,7 +281,6 @@ config.sil_opt = inferSwiftBinary('sil-opt')
 config.sil_extract = inferSwiftBinary('sil-extract')
 config.lldb_moduleimport_test = inferSwiftBinary('lldb-moduleimport-test')
 config.swift_ide_test = inferSwiftBinary('swift-ide-test')
-config.swift_reflection_test = inferSwiftBinary('swift-reflection-test')
 config.swift_reflection_dump = inferSwiftBinary('swift-reflection-dump')
 config.swift_remoteast_test = inferSwiftBinary('swift-remoteast-test')
 config.clang = inferSwiftBinary('clang')
@@ -862,7 +861,7 @@ config.substitutions.append(
      (subst_target_swift_ide_test_mock_sdk,
       subst_target_swift_ide_test_mock_sdk_after)))
 config.substitutions.append(('%target-swift-ide-test', config.target_swift_ide_test))
-config.substitutions.append(('%target-swift-reflection-test', '{test_runner}{variant_suffix} {arch}'.format(test_runner=config.swift_reflection_test, variant_suffix=config.variant_suffix, arch=run_cpu)))
+config.substitutions.append(('%target-swift-reflection-test', 'swift-reflection-test{variant_suffix} {arch}'.format(variant_suffix=config.variant_suffix, arch=run_cpu)))
 config.substitutions.append(('%target-swift-reflection-dump', '{} {} {}'.format(config.swift_reflection_dump, '-arch', run_cpu)))
 config.substitutions.append(('%target-swiftc_driver', config.target_swiftc_driver))
 config.substitutions.append(('%target-swift-remoteast-test-with-sdk',

From 0c83fce1c6b80e1f7332d13e57046a1f5568f1fa Mon Sep 17 00:00:00 2001
From: David Farler <dfarler@apple.com>
Date: Wed, 27 Apr 2016 12:56:27 -0700
Subject: [PATCH 3/3] Link swift-reflection-test* with swiftRemoteMirror

Eventually this tool will test solely with the C API, so wire up
the dependencies now. This also fixes an annoying dependency issue
when building some testing configurations.

rdar://problem/25943881
---
 stdlib/private/SwiftReflectionTest/CMakeLists.txt | 9 +++++++++
 tools/swift-reflection-test/CMakeLists.txt        | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
index a5ccced5eadef..a0a6f303e2427 100644
--- a/stdlib/private/SwiftReflectionTest/CMakeLists.txt
+++ b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
@@ -6,3 +6,12 @@ add_swift_library(swiftSwiftReflectionTest SHARED IS_STDLIB
   SWIFT_MODULE_DEPENDS Darwin
   SWIFT_COMPILE_FLAGS ${swift_reflection_test_compile_flags}
   INSTALL_IN_COMPONENT stdlib-experimental)
+
+foreach(SDK ${SWIFT_SDKS})
+  foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
+    set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
+    add_dependencies(
+      "swiftSwiftReflectionTest${VARIANT_SUFFIX}"
+      "swift-reflection-test${VARIANT_SUFFIX}")
+  endforeach()
+endforeach()
diff --git a/tools/swift-reflection-test/CMakeLists.txt b/tools/swift-reflection-test/CMakeLists.txt
index bcd920e6fadcc..f3826d0ae5bb6 100644
--- a/tools/swift-reflection-test/CMakeLists.txt
+++ b/tools/swift-reflection-test/CMakeLists.txt
@@ -2,5 +2,6 @@ add_swift_target_executable(swift-reflection-test BUILD_WITH_STDLIB
   swift-reflection-test.cpp
   overrides.cpp
   LINK_FAT_LIBRARIES
-    swiftReflection)
+    swiftReflection
+    swiftRemoteMirror)