[all-commits] [llvm/llvm-project] 52beec: Fix compiler-rt build on macOS without XCode

[Alexander Richardson via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 52beec76de83934b9be4448deb3a509b224e4a7e
      https://github.com/llvm/llvm-project/commit/52beec76de83934b9be4448deb3a509b224e4a7e
  Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
  Date:   2019-10-31 (Thu, 31 Oct 2019)

  Changed paths:
    M compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake

  Log Message:
  -----------
  Fix compiler-rt build on macOS without XCode

Summary:
Starting with 8a5bfbe6db2824642bf9a1d27a24c5b6132b244f (D68292) this file
unconditionally uses xcodebuild to get the SDK version. On my system this
always fails with
`xcode-select: error: tool 'xcodebuild' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance`

Reviewers: delcypher, yln

Reviewed By: delcypher, yln

Subscribers: dberris, mgorny, #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D69610


  Commit: 8baedb82bafe2a9efb341b6207238b2af0f1ce07
      https://github.com/llvm/llvm-project/commit/8baedb82bafe2a9efb341b6207238b2af0f1ce07
  Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
  Date:   2019-10-31 (Thu, 31 Oct 2019)

  Changed paths:
    M compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
    M compiler-rt/cmake/config-ix.cmake

  Log Message:
  -----------
  [compiler-rt] Use xcrun instead of xcodebuild to find the SDK directory

Summary:
xcodebuild does not work unless XCode is installed whereas xcrun also work
when only the Command Line Tools are installed. Unlike the check for the
version (D69610), this did not cause an erro for me since the fallback to
/usr/include for the OSX sysroot worked.

Reviewers: yln, delcypher

Reviewed By: yln

Subscribers: dberris, mgorny, #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D69659


  Commit: d9cc7d14085a9c7d3f04380d974160be759a09eb
      https://github.com/llvm/llvm-project/commit/d9cc7d14085a9c7d3f04380d974160be759a09eb
  Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
  Date:   2019-10-31 (Thu, 31 Oct 2019)

  Changed paths:
    M llvm/utils/update_cc_test_checks.py

  Log Message:
  -----------
  [update_cc_test_checks.py] Pass the builtin include dir to clang

Summary:
This is required to update tests that make use of builtin headers. To fix
this use the same command expansion as lit does for %clang_cc1. I tested
this by updating clang/test/CodeGen/arm-mve-intrinsics/scalar-shifts.c.
%clang_cc1 will now expand to `clang -cc1 -internal-isystem
$LLVM_BUILD/lib/clang/$VERSION/include -nostdsysteminc`.

Reviewers: MaskRay

Reviewed By: MaskRay

Subscribers: kristof.beyls, dmgreen, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D69611


Compare: https://github.com/llvm/llvm-project/compare/54a873b158bd...d9cc7d14085a