Merge commit 'refs/am/changes/01e69cdd4fcb8414507c9d53d2a6b3370f65d313_swift/master-rebranch' into HEAD

Teemperor · Teemperor · commit 337d8eeb0a25 · 2020-01-20T09:30:27.000+01:00
Conflicts:
	lldb/test/CMakeLists.txt
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
@@ -124,6 +124,10 @@ if(swift IN_LIST LLVM_EXTERNAL_PROJECTS)
 endif()
 # END Swift Mods
 
+if (LLDB_BUILT_STANDALONE)
+  set(LLVM_HOST_TRIPLE ${TARGET_TRIPLE})
+endif()
+
 add_lldb_test_dependency(
   lit-cpuid
   llc
