From: Matthias Braun <matze@braunis.de>
Date: Sat, 11 Feb 2017 00:14:01 +0000 (+0000)
Subject: config-ix.cmake: Search for CMAKE_XCRUN before using it.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f013f8a831894dc16d0169f06c434b19e6ab725;p=llvm

config-ix.cmake: Search for CMAKE_XCRUN before using it.

This was previously searched in CMakeLists.txt unconditionally but as of
r294371 it is only searched in some circumstances. Repeating the search
in config-ix.cmake to make this robust and hopefully fix the macOS
Asan+Ubsan jenkins build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294811 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 6bd2b535500..e2b4bf999a4 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -546,6 +546,9 @@ set(LLVM_BINUTILS_INCDIR "" CACHE PATH
 	"PATH to binutils/include containing plugin-api.h for gold plugin.")
 
 if(CMAKE_HOST_APPLE AND APPLE)
+  if(NOT CMAKE_XCRUN)
+    find_program(CMAKE_XCRUN NAMES xcrun)
+  endif()
   if(CMAKE_XCRUN)
     execute_process(COMMAND ${CMAKE_XCRUN} -find ld
       OUTPUT_VARIABLE LD64_EXECUTABLE