[all-commits] [llvm/llvm-project] e3b041: [lldb] Change the xcrun (fallback) logic in GetXco...

Jonas Devlieghere via All-commits all-commits at lists.llvm.org
Tue Oct 6 15:55:24 PDT 2020


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: e3b0414b0ea305396a1fcfb2821ad643b0731880
      https://github.com/llvm/llvm-project/commit/e3b0414b0ea305396a1fcfb2821ad643b0731880
  Author: Jonas Devlieghere <jonas at devlieghere.com>
  Date:   2020-10-06 (Tue, 06 Oct 2020)

  Changed paths:
    M lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm

  Log Message:
  -----------
  [lldb] Change the xcrun (fallback) logic in GetXcodeSDK

This changes the logic in GetXcodeSDK to find an SDK with xcrun. The
code now executes the following steps:

 1. If DEVELOPER_DIR is set in the environment, it invokes xcrun with
    the given developer dir. If this fails we stop and don't fall back.
 2. If the shlib dir is set and exists,it invokes xcrun with the
    developer dir corresponding to the shlib dir. If this fails we fall
    back to 3.
 3. We run xcrun without a developer dir.

The new behavior introduced in this patch is that we fall back to
running xcrun without a developer dir if running it based on the shlib
dir failed.

A situation where this matters is when you're running lldb from an Xcode
that has no SDKs and that is not xcode-selected. Based on lldb's shlib
dir pointing into this Xcode installation, it will do an xcrun with the
developer set to the Xcode without any SDKs which will fail. With this
patch, when that happens, we'll fall back to trying the xcode-selected
Xcode by running xcrun without a developer dir.

Differential revision: https://reviews.llvm.org/D88866




More information about the All-commits mailing list