Also log the error output from xcrun, if it fails. (llvm#70716)

adrian-prantl · web-flow · commit 15733fe5f3cb · 2023-10-31T15:36:06.000-07:00
In the rare case that an Xcode installation is damaged, this output
could contain clues to further diagnose the issue.

rdar://117698630
diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -417,6 +417,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
`@@ -417,6 +417,8 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {`
`417`	`417`	`// xcrun didn't find a matching SDK. Not an error, we'll try`
`418`	`418`	`// different spellings.`
`419`	`419`	`LLDB_LOG(log, "xcrun returned exit code {0}", status);`
	`420`	`+ if (!output_str.empty())`
	`421`	`+ LLDB_LOG(log, "xcrun output was:\n{0}", output_str);`
`420`	`422`	`return "";`
`421`	`423`	`}`
`422`	`424`	`if (output_str.empty()) {`