Merge pull request swiftlang#7724 from adrian-prantl/cherry-pick-swift-release-5.10-Also-log-the-error-output-from-xcrun-if-it-fails.-70716

adrian-prantl · web-flow · commit 286ccd32e8e8 · 2023-11-01T08:55:27.000-07:00
[Cherry-pick into swift/release/5.10] Also log the error output from xcrun, if it fails. (llvm#70716)
diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -414,6 +414,8 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {
     // xcrun didn't find a matching SDK. Not an error, we'll try
     // different spellings.
     LLDB_LOG(log, "xcrun returned exit code {0}", status);
+    if (!output_str.empty())
+      LLDB_LOG(log, "xcrun output was:\n{0}", output_str);
     return "";
   }
   if (output_str.empty()) {

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,8 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {`
`414`	`414`	`// xcrun didn't find a matching SDK. Not an error, we'll try`
`415`	`415`	`// different spellings.`
`416`	`416`	`LLDB_LOG(log, "xcrun returned exit code {0}", status);`
	`417`	`+ if (!output_str.empty())`
	`418`	`+ LLDB_LOG(log, "xcrun output was:\n{0}", output_str);`
`417`	`419`	`return "";`
`418`	`420`	`}`
`419`	`421`	`if (output_str.empty()) {`